Skip to content

GitLab

Switch branch/tag
  1. 02 Nov, 2015 1 commit
  3. 29 Oct, 2015 7 commits
  5. 28 Oct, 2015 6 commits
    • Ying Wang's avatar
      Merge "Normalize the product makefile path in inherit-product." · aabff90b
      Ying Wang authored
      aabff90b
    • Ying Wang's avatar
      Fix "make product-graph" and "make dump-products". · 67132baa
      Ying Wang authored 
      - For unmodified "make product-graph" and "make dump-products",
  load only the current product configuration makefiles. This is much
  faster than loading all product makefiles.
- For "make product-graph ANDROID_PRODUCT_GRAPH=--all",
  "make dump-products ANDROID_DUMP_PRODUCTS=all", load all product
  makefiles.
- Move product-graph.mk out of build tasks, so we can skip loading all
  the Android.mks, which takes long and we don't really need them.
  More importantly, with all product makefiles loaded, modules in
  Android.mks are prone to clash (if they are conditionally included
  by variables set up in product makefiles) and lead to parse-time
  error.

Change-Id: Idc1d6b0c23eb2c8bb34fdd7a1fa4d56171768d21
      67132baa
    • Ying Wang's avatar
      Normalize the product makefile path in inherit-product. · a1742610
      Ying Wang authored 
      Some vendor product makefiles call $(inherit-product) on the same
product makefile with different paths, by using "../" in relative paths.
However inherit-product requires unique path as ID for a product
makefile, for bookkeeping purpose.
Normalize the product makefile path in inherit-product, if the path
contains "../".

Change-Id: I1a864ce120c713d8e79ec179213b9fc9352aba53
      a1742610
    • Colin Cross's avatar
      Merge "Remove use of .INTERMEDIATE" · dda5e96b
      Colin Cross authored
      dda5e96b
    • Colin Cross's avatar
      Remove use of .INTERMEDIATE · 42470e91
      Colin Cross authored 
      make 3.81 has a bug where combining an up-to-date .INTERMEDIATE rule
with -j causes an infinite loop (http://savannah.gnu.org/bugs/?15919).
.INTERMEDIATE was only necessary to support multiple outputs while only
running a command once, remove .INTERMEDIATE by replacing
$(KATI_OUTPUTS) dependencies with $(KATI_BUILD_NINJA).  We can assume
that $(KATI_NINJA_SH) will be updated at the same time as
$(KATI_BUILD_NINJA), and not explicitly depend on it.

Also remove generateonly and fastincremental, which are no longer
necessary and were overcomplicating ninja.mk.  kati now always runs due
to FORCE, and ninja is run by a phony rule that depends on
$(KATI_BUILD_NINJA).

Bug: 25344116
Change-Id: I99d2713b1532ea11d83da9a11b1be26cfe13a5d2
      42470e91
    • Tao Bao's avatar
      Honor TARGET_NO_RECOVERY flag. · db45efa6
      Tao Bao authored 
      Don't generate recovery.img when calling 'make dist' if
TARGET_NO_RECOVERY is set. The build system passes the flag to the
packaging script which then generates recovery.img conditionally.

Bug: 25329471
Change-Id: Ifbc999300d5c31e897878f81e231ae7dd2aca660
      db45efa6
  7. 27 Oct, 2015 9 commits
  9. 26 Oct, 2015 3 commits
  11. 24 Oct, 2015 3 commits
    • Colin Cross's avatar
      Merge "Add dummy description for GET-INSTALL-PATH" · 9d192f1c
      Colin Cross authored
      9d192f1c
    • Colin Cross's avatar
      Add dummy description for GET-INSTALL-PATH · ec1b5619
      Colin Cross authored 
      kati takes the first @echo command in a rule and turns it in to a ninja
description that gets pretty-printed.  The GET-INSTALL-PATH is only
@echo commands and is parsed by development/testrunner/runtest.py, so
it fails to parse the pretty-printed first test.

Add a dummy @echo to GET-INSTALL-PATH for kati to use as the
description, so the rest of the @echo commands are left unmodified.

Change-Id: I192fde48b26726a2f6760448f819243bd2f21312
      ec1b5619
    • Colin Cross's avatar
      Error out early on nonstandard JDK directory layouts · 112753ca
      Colin Cross authored 
      On Darwin, javac may be located in a nonstandard directory layout such as:
/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/javac
The sed command to replace bin/javac with lib/tools.jar would fail to
match, resulting in the HOST_JDK_TOOLS_JAR being set to the javac path.
Since javac exists, the checks for missing tools.jar would all pass, and
javac would be added to the classpath instead of tools.jar, and causing
hard to debug errors about missing com.sun.javadoc when building doclava.

Change the sed command to replace /javac$, which should always be found,
with /../lib/tools.jar.

Change-Id: I5072f04636a5c14b3aeaa3a5cc3b366feae89c37
      112753ca
  13. 23 Oct, 2015 9 commits
  15. 22 Oct, 2015 2 commits