tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25720 commits 1 branch 0 tags 119 MiB
Commit graph

8354 commits

Author SHA1 Message Date
Colin Cross
9fc7d3d61e am 2ce7528a: Merge "makeparallel needs global CFLAGS now" 
* commit '2ce7528a92d132523317dcb1252cf0c47459038b':
  makeparallel needs global CFLAGS now
 2015-09-30 05:17:20 +00:00
Colin Cross
8f26a45bb6 makeparallel needs global CFLAGS now 
After 3ad3549519 (Don't add CFLAGS to
CPPFLAGS), makeparallel now needs to explicitly include CFLAGS like
kati.

Change-Id: Ib50328da147f03647bb5b99f6d69948d644eece9
 2015-09-30 05:11:40 +00:00
Colin Cross
80e46c7c5c Move the dist-as-droid handling from make to ninja 
dist is a strange dual-use target, as both a flag and a goal.  make dist
<target> means build <target>, but copy any dist-for-goals files to
$DIST_DIR.  make dist without a target means build droid with
dist-for-goals files.  This requires special handling of MAKECMDGOALS to
detect the case where dist is the only goal, which breaks when ninja.mk
doesn't pass all the goals to kati.  Instead, let ninja handle the
default goal.  Pass dist to kati if it is specified in order to turn on
the dist-for-goal rules, but filter it out of the goals passed to
ninja.  If there are any other goals, ninja will build them.  If there
are no goals, ninja will fall back to the default goal, which is droid.

Change-Id: Iafb184d28cb312cb7c5682cd3ff4f310b2d9f7e9
 2015-09-29 17:15:09 -07:00
Dan Willemsen
379f9f9cec Add all-cpp-files-under 
There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.

Bug: 24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
 2015-09-29 16:32:28 -07:00
Colin Cross
08c482804e am 1197f00e: am 12d7867f: Merge changes If34a7900,Iaea1f158 
* commit '1197f00e40d71ece08523401d4cd74acd2037680':
  Revert "Have all targets in build.ninja"
  Revert "Pass all goals to kati when "dist" is in goals"
 2015-09-29 22:54:59 +00:00
Colin Cross
1197f00e40 am 12d7867f: Merge changes If34a7900,Iaea1f158 
* commit '12d7867f5fe23203de952b7f876d01d63f8294d1':
  Revert "Have all targets in build.ninja"
  Revert "Pass all goals to kati when "dist" is in goals"
 2015-09-29 22:47:50 +00:00
Colin Cross
8f9f01bbc3 Revert "Have all targets in build.ninja" 
--gen_all_targets seems to be dropping some intermediate targets,
causing problems when kati is passed a goal and then ninja is run with
checkbuild as a goal, for example with:
m -j PRODUCT-aosp_flounder-userdebug checkbuild

This reverts commit 92bbf5667d.

Change-Id: If34a790028f8da98fcc713e3f7000d06c63dcf80
 2015-09-29 14:21:24 -07:00
Colin Cross
52b697a488 Revert "Pass all goals to kati when "dist" is in goals" 
This isn't actually necessary, dist doesn't use MAKEDISTGOALS other than
to check if it contains any other real targets.  The real issue is
caused by --gen_all_targets, and is broader than just "dist".

This reverts commit d3701e9e96.

Change-Id: Iaea1f158dbd1d4b9035954efef40b33485e6c6b3
 2015-09-29 14:20:28 -07:00
Tao Bao
54fee2c407 am 5bd910a5: am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip." 
* commit '5bd910a56e90025539abe432e01c72f3bea15a2d':
  Pack libdivsufsort.so into otatools.zip.
 2015-09-29 17:47:49 +00:00
Tao Bao
5bd910a56e am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip." 
* commit '7e9b4ec44c63cb2e89388250aa6547aa6eddcab8':
  Pack libdivsufsort.so into otatools.zip.
 2015-09-29 17:42:44 +00:00
Tao Bao
7e9b4ec44c Merge "Pack libdivsufsort.so into otatools.zip." 2015-09-29 17:38:14 +00:00
Colin Cross
c09a2e7ed8 am 96caa978: am 02d04b4d: Merge "Pass all goals to kati when "dist" is in goals" 
* commit '96caa97814b2c439030dac0f2fc73aa87627ddcd':
  Pass all goals to kati when "dist" is in goals
 2015-09-29 17:18:54 +00:00
Colin Cross
96caa97814 am 02d04b4d: Merge "Pass all goals to kati when "dist" is in goals" 
* commit '02d04b4ddceba1a949f2d3d3abf0e5bcb8508cbc':
  Pass all goals to kati when "dist" is in goals
 2015-09-29 17:13:24 +00:00
Colin Cross
02d04b4ddc Merge "Pass all goals to kati when "dist" is in goals" 2015-09-29 17:09:03 +00:00
Nicolas Geoffray
9be13a763c am 3f054bdd: am 506857e9: Merge "Make linker configurable through environment." 
* commit '3f054bdd0d8201c6ebc7f5037a3af685d8eb8062':
  Make linker configurable through environment.
 2015-09-29 09:08:40 +00:00
Nicolas Geoffray
3f054bdd0d am 506857e9: Merge "Make linker configurable through environment." 
* commit '506857e974ed1aac60bff96a71d0eb182865bed8':
  Make linker configurable through environment.
 2015-09-29 09:04:59 +00:00
Nicolas Geoffray
506857e974 Merge "Make linker configurable through environment." 2015-09-29 08:34:28 +00:00
Shinichiro Hamaji
63fad193a5 am 753550d1: am 03d8b188: Merge "Have all targets in build.ninja" 
* commit '753550d153507c2bc69a4aa573e12568dd3a7c4a':
  Have all targets in build.ninja
 2015-09-29 07:07:13 +00:00
Shinichiro Hamaji
753550d153 am 03d8b188: Merge "Have all targets in build.ninja" 
* commit '03d8b18881d845a22c44727c8156cada16630b49':
  Have all targets in build.ninja
 2015-09-29 06:58:51 +00:00
Shinichiro Hamaji
d3701e9e96 Pass all goals to kati when "dist" is in goals 
Bug: 24339367
Change-Id: Iee80d65fe169ec005900a96446aa7a432fc68872
 2015-09-29 15:52:58 +09:00
Shinichiro Hamaji
92bbf5667d Have all targets in build.ninja 
We should pass --gen_all_targets instead of --gen_all_phony_targets
to have targets which are not declared as .PHONY.

Bug: 24384320
Change-Id: I616d8c74e6efd9d69b1a935cfc5116b716f100ff
 2015-09-29 14:18:59 +09:00
Shinichiro Hamaji
bd11df9895 am 31966bdb: am ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit '31966bdb8c3e4c001736fc714a9baf8fa2c2acb2':
  Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-29 04:08:47 +00:00
Shinichiro Hamaji
31966bdb8c am ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit 'ad8df5adac7d844014f74c60ce40e3cae02e5eaf':
  Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-29 04:03:44 +00:00
Shinichiro Hamaji
ad8df5adac Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 2015-09-29 03:54:59 +00:00
Colin Cross
5acaa9dca0 am 7ee3b85e: resolved conflicts for 953981db to stage-aosp-master 
* commit '7ee3b85eba08304cb9e396aaf52a77729f125532':
  Don't add dependencies on Makefiles when using ninja
 2015-09-29 01:52:46 +00:00
Colin Cross
7ee3b85eba resolved conflicts for 953981db to stage-aosp-master 
Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973
 2015-09-28 18:45:23 -07:00
Stephen Hines
d11c18a4b0 Fix RS NDK usage so we always pull from "current" instead of NDK 8. 
The 8 in this definition refers to NDK release 8, not the API level 8.
Setting it to "current" is better, since it still contains the relevant
target API level (9 in our case) for using/building our RS support APIs.

Change-Id: Ib216ea859e137643fba81c39c4b9d0077ec04455
 2015-09-28 18:07:21 -07:00
Colin Cross
5c3edc045b am 98da13bb: resolved conflicts for 6c3bf1b8 to stage-aosp-master 
* commit '98da13bbd2db4b2247b90d83deec5e8befbee536':
  Use zip -q for adding shared libraries
 2015-09-28 23:49:46 +00:00
Tao Bao
f6d83021d4 Pack libdivsufsort.so into otatools.zip. 
This is to support the change to bsdiff which depends on
libdivsufsort.so and libdivsufsort64.so now.

Bug: 24332905
Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14
 2015-09-28 16:42:51 -07:00
Colin Cross
98da13bbd2 resolved conflicts for 6c3bf1b8 to stage-aosp-master 
Change-Id: If93ed1d9229f7fbe750f85ea4b3c3e4fce5dbb29
 2015-09-28 16:41:45 -07:00
Colin Cross
a4447e8c89 Don't add dependencies on Makefiles when using ninja 
Ninja has an implicit dependency on the command being run, and kati will
regenerate the ninja manifest if any read makefile changes, so there is no
need to have dependencies on makefiles.
This won't catch all the cases where LOCAL_ADDITIONAL_DEPENDENCIES contains
a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't
include base_rules.mk, but it will fix the most common ones.

Bug: 23566977
Change-Id: I66de882421376303ab7233c8ce7274548f6b2199
 2015-09-28 16:29:52 -07:00
Colin Cross
92f8348aeb Use zip -q for adding shared libraries 
Make zip quiet when adding shared libraries to apks.

Bug: 24409581
Change-Id: I540510eb6e051b5fc9d1d2a7fa5565a5b774a602
 2015-09-28 16:15:09 -07:00
Colin Cross
3a28bb145c am e06e961c: am 7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build" 
* commit 'e06e961cc69b48e562f42464d4db0adc2b8d81d9':
  Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
 2015-09-28 23:13:46 +00:00
Colin Cross
e06e961cc6 am 7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build" 
* commit '7edec14c8dfe4e499cba0d77dc20bc985af1f586':
  Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
 2015-09-28 23:04:57 +00:00
Shinichiro Hamaji
8b08f3a864 Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS 
Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.

Also, always specify --gen_all_phony_targets. With this flag, kati emits
all phony targets in the ninja file so a ninja file generated only with
PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing.

This is a reland attempt of
https://android-review.googlesource.com/#/c/172800/

The two issues should have been fixed by Ying in internal trees.

Bug: 24339367
Change-Id: I8ba2254f9bff271da2a7aa7684fd3d987e07c9d3
 2015-09-28 16:03:21 -07:00
Colin Cross
6749338480 am 5540a746: am f262f906: Merge "Remove "preparing StaticLib" messages" 
* commit '5540a746b6bb52b6511ab58fe7c14822e23947c1':
  Remove "preparing StaticLib" messages
 2015-09-28 22:36:18 +00:00
Colin Cross
fe5e6894d2 Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build 
Distinguish between parsing makefiles in make for a pre-ninja build,
parsing makefiles in kati for a ninja build, and parsing makefiles in
make for a non-ninja build by leaving USE_NINJA=true enabled for the
kati pass but also setting BUILDING_WITH_NINJA.

Change-Id: I63f1ce1efe08cd86fdf41f8051901f720b38cfaf
 2015-09-28 15:36:05 -07:00
Colin Cross
5540a746b6 am f262f906: Merge "Remove "preparing StaticLib" messages" 
* commit 'f262f906f28f1abedb32b1645b7f1ed5c0abbe45':
  Remove "preparing StaticLib" messages
 2015-09-28 22:26:54 +00:00
Colin Cross
aa0aca69cf Remove "preparing StaticLib" messages 
The preparing StaticLib messages don't provide any useful information,
remove them to clean up build output.

Bug: 24409581
Change-Id: I81fa7c47fd0d10846a21667b6421b4777260d0e9
 2015-09-28 14:51:19 -07:00
Zach Jang
80dd5c72a6 am 134b372c: am 3ab46587: am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev 
* commit '134b372c09ad16f9aba154e3a14ff24f11010f7a':
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
 2015-09-28 21:43:12 +00:00
Zach Jang
92da6bdb09 am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev 
* commit '5e858e3db9f7b2037dc9e03c08f9687d5a6718bd':
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
 2015-09-28 21:27:22 +00:00
Steve Fung
6a6f185069 am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip" 
* commit 'db4cba4a084c545e692c324abe26be33b0c3434b':
  Package breakpad symbols in target files zip
 2015-09-28 20:30:51 +00:00
Steve Fung
db4cba4a08 am 562ad0b5: Merge "Package breakpad symbols in target files zip" 
* commit '562ad0b5e4f5d49fc62e72ca1d6eb18acab6e90b':
  Package breakpad symbols in target files zip
 2015-09-28 20:24:32 +00:00
Steve Fung
562ad0b5e4 Merge "Package breakpad symbols in target files zip" 2015-09-28 20:07:55 +00:00
Nicolas Geoffray
b7c9f32765 Make linker configurable through environment. 
Change-Id: I152ad7b41cfa05f2f59f51c6d8bd1e427f1a1649
 2015-09-28 10:03:26 +01:00
Shinichiro Hamaji
05ae340c25 am a9bd9981: am cf448ddb: Merge "Use gomacc even for FDO build" 
* commit 'a9bd99816f768531f43367facc01fd140e43115a':
  Use gomacc even for FDO build
 2015-09-28 04:47:57 +00:00
Shinichiro Hamaji
a9bd99816f am cf448ddb: Merge "Use gomacc even for FDO build" 
* commit 'cf448ddb4f95f511575e56a729e0d60a45d84e1e':
  Use gomacc even for FDO build
 2015-09-28 04:43:25 +00:00
Shinichiro Hamaji
cf448ddb4f Merge "Use gomacc even for FDO build" 2015-09-28 04:38:53 +00:00
Colin Cross
06f75b5fe5 am ad4b1ef6: am 581a028f: Merge "Remove checkbuild and test from parse time goals" 
* commit 'ad4b1ef65eb0d2dd783a439732631a5d86efc7f3':
  Remove checkbuild and test from parse time goals
 2015-09-26 03:44:39 +00:00
Colin Cross
ad4b1ef65e am 581a028f: Merge "Remove checkbuild and test from parse time goals" 
* commit '581a028fb562b1d877de2b82d6a08df045d73ec8':
  Remove checkbuild and test from parse time goals
 2015-09-26 03:37:54 +00:00
Colin Cross
581a028fb5 Merge "Remove checkbuild and test from parse time goals" 2015-09-26 03:33:35 +00:00
Shinichiro Hamaji
09295a82f8 Use gomacc even for FDO build 
Goma's client recognizes -fprofile-use= flag so shoulde be
compatible with Android's FDO build.

Change-Id: I0d21d6f530cd05770f8dc12e9dc33a5db49a9c7d
 2015-09-26 12:01:21 +09:00
Steve Fung
dfbab49bed Package breakpad symbols in target files zip 
When BREAKPAD_GENERATE_SYMBOLS is set to true, package the breakpad
symbols into the target files zip thats generated with `make dist`.

Bug: 24165970
Change-Id: I11c0d9a9d9e159475bfdb7bc338f9e9ac60aeada
 2015-09-25 18:34:15 -07:00
Ying Wang
5a4ec4e8c0 am 3a3c21ca: am 094116f0: Merge "Remove the unnecessary rs_compatibility_jni_libs install rules." 
* commit '3a3c21cafb27b4015005f0d0ddf1acfc913d18f6':
  Remove the unnecessary rs_compatibility_jni_libs install rules.
 2015-09-26 01:12:52 +00:00
Ying Wang
3a3c21cafb am 094116f0: Merge "Remove the unnecessary rs_compatibility_jni_libs install rules." 
* commit '094116f0374da3dcba3ff1425f0cb42caf1c6d59':
  Remove the unnecessary rs_compatibility_jni_libs install rules.
 2015-09-26 01:06:38 +00:00
Ying Wang
094116f037 Merge "Remove the unnecessary rs_compatibility_jni_libs install rules." 2015-09-26 01:00:14 +00:00
Colin Cross
ffd25c7f14 am 84494473: am aaa9d8dc: Merge "Fix windows build" 
* commit '8449447384a882e302861892ea6edf92ebd4d55e':
  Fix windows build
 2015-09-26 00:20:57 +00:00
Colin Cross
8449447384 am aaa9d8dc: Merge "Fix windows build" 
* commit 'aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f':
  Fix windows build
 2015-09-26 00:15:44 +00:00
Colin Cross
309b420d56 Fix windows build 
The windows toolchain doesn't support color, only apply
-fdiagnostics-color to HOST and TARGET, not HOST_CROSS.

Change-Id: I17b999a2852b8d70b2d39a58befa10e2e32c4608
 2015-09-25 17:00:14 -07:00
Colin Cross
77dfa520d4 am cf26cbfb: am 67020d23: Merge "Link libgtest_main before libgtest" 
* commit 'cf26cbfb48a795c9e4c21d9219ec5ad26e69f044':
  Link libgtest_main before libgtest
 2015-09-25 23:46:28 +00:00
Colin Cross
c53d6b90b3 Remove checkbuild and test from parse time goals 
The tests goal is not a parse time goal.

The checkbuild goal is only a parse time goal so that it doesn't result
in a circular dependency between droid and checkbuild when
ANDROID_BUILD_EVERYTHING_BY_DEFAULT is set.  Get rid of the circular
dependency by making droid depend on droid_targets, and droid_targets
depend on the targets that are normally built for droid.  checkbuild can
then always depend on droid_targets, and droid can condtionally depend
on checkbuild without introducing a circular dependency.

Bug: 24413153
Change-Id: I231d80e05ffe321384a5efbcdf5578f86ad84da0
 2015-09-25 16:43:36 -07:00
Colin Cross
cf26cbfb48 am 67020d23: Merge "Link libgtest_main before libgtest" 
* commit '67020d2338dd51af5daa3479624acaa494be51a9':
  Link libgtest_main before libgtest
 2015-09-25 23:38:29 +00:00
Colin Cross
6edd4ccad3 am ba9bc4d7: am 0d97557d: Merge "Enable color output from gcc and clang" 
* commit 'ba9bc4d70f2099ad2db9b759462a354d6f659b9a':
  Enable color output from gcc and clang
 2015-09-25 23:22:28 +00:00
Colin Cross
ba9bc4d70f am 0d97557d: Merge "Enable color output from gcc and clang" 
* commit '0d97557d3d6f56cf6dfdb7552d4f1471d56dfabe':
  Enable color output from gcc and clang
 2015-09-25 23:17:02 +00:00
Ying Wang
ac30b88dc4 Remove the unnecessary rs_compatibility_jni_libs install rules. 
We only build rs_compatibility_jni_libs for unbundled build or when
FORCE_BUILD_RS_COMPAT is set. We don't need to install the
rs_compatibility_jni_libs to system.img in either case.

It's bad idea to install them to system.img, because when two modules
have .rs files with the same name, their installed files conflict.

Change-Id: I7524a301c59396db464f28b17b8f8bf1f15523ca
 2015-09-25 16:14:57 -07:00
Colin Cross
3a0a8918b2 Link libgtest_main before libgtest 
libgtest_main uses symbols from libgtest.  If libgtest_main is linked
after libgtest, and the test .o files don't reference libgtest (which is
unlikely), then the libgtest .o files will be ignored and libgtest_main
won't be able to find its symbols from libgtest.

Change-Id: Ica3bc679bd9d14e9a3065be927f085cf52faab64
 2015-09-25 16:11:31 -07:00
Colin Cross
0d97557d3d Merge "Enable color output from gcc and clang" 2015-09-25 23:10:45 +00:00
Christopher Ferris
2ccf272868 am 9937e7b2: am 76ec0c4c: Merge "Set mcpu targets based on cpu variant." 
* commit '9937e7b2a30e87014461caf928909c2c87924079':
  Set mcpu targets based on cpu variant.
 2015-09-25 16:44:05 +00:00
Christopher Ferris
9937e7b2a3 am 76ec0c4c: Merge "Set mcpu targets based on cpu variant." 
* commit '76ec0c4c53aab6fca7af1badab882518962a9755':
  Set mcpu targets based on cpu variant.
 2015-09-25 16:35:56 +00:00
Christopher Ferris
76ec0c4c53 Merge "Set mcpu targets based on cpu variant." 2015-09-25 16:29:33 +00:00
Shinichiro Hamaji
9bcb94abd1 am 886caa44: am 77d17b6c: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"" 
* commit '886caa4405e5aac6143f08c359ea1f777eda87ec':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
 2015-09-25 05:40:40 +00:00
Colin Cross
63e3b0294f Enable color output from gcc and clang 
Force gcc and clang to always output color diagnostics.  Ninja will
strip the ANSI color codes if it is not running in a terminal.

Bug: 24273983
Change-Id: Ic9252549bfacf3bbb3f4b9d20f63010fc24ac21d
 2015-09-24 22:39:17 -07:00
Shinichiro Hamaji
886caa4405 am 77d17b6c: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"" 
* commit '77d17b6c0b485a9ac45f52e9c5b908b4efec593f':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
 2015-09-25 05:31:51 +00:00
Shinichiro Hamaji
5ff665d407 Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
This reverts commit cb31f040e3.

This could be the cause of an internal build breakage.

Change-Id: Ic5d2a2ce1f2d214a8201db5c570682d8336763b9
 2015-09-25 14:21:37 +09:00
Shinichiro Hamaji
b1896a0ba2 am f10727ff: am 4f40525f: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit 'f10727ff06b7c08105f56ed5cacf0ef15fde2777':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-25 05:13:29 +00:00
Shinichiro Hamaji
f10727ff06 am 4f40525f: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit '4f40525f782348a64674222be54f5aae3367157c':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-25 05:07:34 +00:00
Shinichiro Hamaji
cb31f040e3 Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS 
Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.

Also, always specify --gen_all_phony_targets. With this flag, kati emits
all phony targets in the ninja file so a ninja file generated only with
PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing.

Bug: 24339367
Change-Id: I63237160c3c86817b53635665d56906790ec4e6a
 2015-09-25 13:49:46 +09:00
Shinichiro Hamaji
3834168a89 am 5d1006ca: am 3c524993: Merge "Make it possible to change the number of remote jobs" 
* commit '5d1006cab6f8a9a23ee5011b653ea7a3ed71380c':
  Make it possible to change the number of remote jobs
 2015-09-25 04:48:29 +00:00
Shinichiro Hamaji
5d1006cab6 am 3c524993: Merge "Make it possible to change the number of remote jobs" 
* commit '3c524993c7d18cd9396a4d014c58039478c21e3e':
  Make it possible to change the number of remote jobs
 2015-09-25 04:42:46 +00:00
Shinichiro Hamaji
3c524993c7 Merge "Make it possible to change the number of remote jobs" 2015-09-25 04:34:37 +00:00
Shinichiro Hamaji
d5b9dfa519 am 412e7ee1: am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 
* commit '412e7ee1f9370b35c68f982e922e6f5e7bd38190':
  Allow USE_GOMA=true without explicit USE_NINJA=true
 2015-09-25 04:34:36 +00:00
Shinichiro Hamaji
412e7ee1f9 am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 
* commit '6b37c7b32af667f6a42b397a27add34d3c59e5fa':
  Allow USE_GOMA=true without explicit USE_NINJA=true
 2015-09-25 04:28:50 +00:00
Shinichiro Hamaji
6b37c7b32a Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 2015-09-25 04:23:28 +00:00
Colin Cross
ede3d2e856 am 45b0c8f1: am c180dd0b: Merge "Revert "disable Krait for Mac builds to avoid assembler issues"" 
* commit '45b0c8f1633ea7762e5bd9517d89cb716e09beb4':
  Revert "disable Krait for Mac builds to avoid assembler issues"
 2015-09-25 01:20:29 +00:00
Colin Cross
45b0c8f163 am c180dd0b: Merge "Revert "disable Krait for Mac builds to avoid assembler issues"" 
* commit 'c180dd0bfc55ae222f143dc86a333caf000cbf03':
  Revert "disable Krait for Mac builds to avoid assembler issues"
 2015-09-25 01:11:48 +00:00
Colin Cross
c180dd0bfc Merge "Revert "disable Krait for Mac builds to avoid assembler issues"" 2015-09-25 01:07:52 +00:00
Colin Cross
737cc70b50 Revert "disable Krait for Mac builds to avoid assembler issues" 
This doesn't seem to be a problem any more, and mac builds
that differ from linux builds is causing other problems.

This reverts commit 7c40fb95dc.

Bug: 24339250
Change-Id: I8a0da11df42d58ba9c3ded4571f1db870f400a21
 2015-09-25 00:30:34 +00:00
Steve Fung
290b670724 am f3ec8272: am fdec88c9: Merge "Generate breakpad symbols" 
* commit 'f3ec82729a0543a1bccaac08087b8c9c0556fc64':
  Generate breakpad symbols
 2015-09-25 00:08:04 +00:00
Ying Wang
34a38f2c6c am 945bc2f2: am 92facb1f: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names." 
* commit '945bc2f28865935125a465f1480e4fbc39a54b99':
  Substitue "/" with "-" in the MODULES-IN phony goal names.
 2015-09-25 00:08:03 +00:00
Steve Fung
f3ec82729a am fdec88c9: Merge "Generate breakpad symbols" 
* commit 'fdec88c9726687f98448ccff7670bc843f77bf66':
  Generate breakpad symbols
 2015-09-25 00:03:21 +00:00
Ying Wang
945bc2f288 am 92facb1f: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names." 
* commit '92facb1fed26492746aca267df51b6082286521c':
  Substitue "/" with "-" in the MODULES-IN phony goal names.
 2015-09-24 23:59:29 +00:00
Steve Fung
fdec88c972 Merge "Generate breakpad symbols" 2015-09-24 23:57:42 +00:00
Steve Fung
cb2e67fdb7 Generate breakpad symbols 
When BREAKPAD_GENERATE_SYMBOLS is set to true, generate breakpad
symbols for binaries.

Bug: 23900817
Change-Id: I7b992d819350f4f80df5868d16f13016502dfca0
 2015-09-24 16:49:40 -07:00
Ying Wang
61cd884a11 Substitue "/" with "-" in the MODULES-IN phony goal names. 
This avoids Ninja's path canonicalization on those goal names.
Without this, Ninja complains about duplicate rules for
MODULES-IN/a/b/.. and MODULES-IN/a.

Bug: 24309760
Change-Id: Id3aa9da5d3887a2cd1426cbb5fdf35659c65805e
 2015-09-24 16:24:42 -07:00
Elliott Hughes
4f74c05f88 am b101f73b: am 43bbbf8a: Merge "Remove more of the pathmap." 
* commit 'b101f73be95aade6719d1d92c8afbb3df8a0d4c9':
  Remove more of the pathmap.
 2015-09-24 22:05:42 +00:00
Elliott Hughes
b101f73be9 am 43bbbf8a: Merge "Remove more of the pathmap." 
* commit '43bbbf8a15cfc03ce99d0b6a49992b25cf51fc39':
  Remove more of the pathmap.
 2015-09-24 21:59:58 +00:00
Elliott Hughes
43bbbf8a15 Merge "Remove more of the pathmap." 2015-09-24 21:50:42 +00:00
Dan Albert
e9d7906db9 am cc66e98e: am 880f05f4: Merge "Use exported includes for libc++." 
* commit 'cc66e98e798a3cfd0cde78423efde4f26fb3e72c':
  Use exported includes for libc++.
 2015-09-24 21:48:56 +00:00
Dan Willemsen
d898312e3a am af6d2d87: am aeaa0f5c: Merge "Turn shared library multilib warnings into errors" 
* commit 'af6d2d8754b4c125e414d85a36705da4b2fd74f4':
  Turn shared library multilib warnings into errors
 2015-09-24 21:48:55 +00:00
Dan Albert
cc66e98e79 am 880f05f4: Merge "Use exported includes for libc++." 
* commit '880f05f4f28df672eb4ff4ce6b7735480deb13ae':
  Use exported includes for libc++.
 2015-09-24 21:43:54 +00:00
Dan Willemsen
af6d2d8754 am aeaa0f5c: Merge "Turn shared library multilib warnings into errors" 
* commit 'aeaa0f5c580356c0d74dd11e00fb29ae67d97f2b':
  Turn shared library multilib warnings into errors
 2015-09-24 21:38:46 +00:00
Dan Albert
880f05f4f2 Merge "Use exported includes for libc++." 2015-09-24 21:38:21 +00:00
Dan Albert
eb3e3fa5da Use exported includes for libc++. 
Change-Id: Ia5d9c857a43975448a8c2b489cc29be0fa67ddf6
 2015-09-24 14:09:09 -07:00
Christopher Ferris
561b4c1995 Set mcpu targets based on cpu variant. 
Make cortex-a53 and cortex-a53.a57 use cortex-a7.

Change-Id: I89d5b3f044c867ec99aae319eafc33f2edf1f9f2
 2015-09-24 13:59:33 -07:00
Dan Willemsen
7cc88b794d Turn shared library multilib warnings into errors 
When caught later, these just get turned into warnings with
unpredictable results, or non-obvious errors.

Change-Id: Ie7ba88e97dc5bedd6cf850748d79693711ac41da
 2015-09-24 13:21:11 -07:00
Ying Wang
0c538471d1 am 34f7562e: am 3f107055: Merge "The pattern %tests is too broad." 
* commit '34f7562e8625d66de3f43396d4cfdd327d1ac2e5':
  The pattern %tests is too broad.
 2015-09-24 18:53:34 +00:00
Ying Wang
34f7562e86 am 3f107055: Merge "The pattern %tests is too broad." 
* commit '3f10705579deae60d9b903a4587a66a26112ee4a':
  The pattern %tests is too broad.
 2015-09-24 18:45:23 +00:00
Ying Wang
ce2843f455 The pattern %tests is too broad. 
We had fixed the filtering of %tests in art/Android.mk.
Actually the %tests leads to false build<suffix>.ninja when you run:
$ mmma cts/tests/tests/nativeopengl/libnativeopengltests
because the new mmma calls make with goals like
MODULES-IN/cts/tests/tests/nativeopengl/libnativeopengltests .

Bug: 24309760
Change-Id: I35af2e8d046ae40f3b90ec0a92473fcab8ff5db5
 2015-09-24 11:34:46 -07:00
Elliott Hughes
09c255dbd1 Remove more of the pathmap. 
I've fixed libpagemap to export its headers, the only user of the
libnativehelper entry was in this file anyway, and no one was using
the libhost entry.

Change-Id: Id0d1773e55c0114ccc56cefd783689193a6204f9
 2015-09-24 09:02:19 -07:00
Shinichiro Hamaji
c1cba69970 Make it possible to change the number of remote jobs 
User can overwrite NINJA_REMOTE_NUM_JOBS for this purpose. The
number is passed to ninja instead of to kati so no we don't
need to regenerate a ninja file when a user changes this value.

Change-Id: I2ccfaaae4492d84a8b8045dff612cb5f6ebe2c79
 2015-09-24 16:22:44 +09:00
Shinichiro Hamaji
d8f268ecac Allow USE_GOMA=true without explicit USE_NINJA=true 
Now ninja build is disabled only with USE_NINJA=false. So goma.mk
should fail with an error only when USE_NINJA=false is explicitly
specified.

Change-Id: I2fb913433d5c1e93ed2a9bd93bb5000cabd835a4
 2015-09-24 15:19:08 +09:00
Ying Wang
feca5313b7 am 2f9f1fb3: resolved conflicts for 964f06b1 to stage-aosp-master 
* commit '2f9f1fb32f8e2320cbb515c82a3b471da4b6e848':
  Re-implement mma/mmma using make goals.
 2015-09-24 02:37:49 +00:00
Ying Wang
2f9f1fb32f resolved conflicts for 964f06b1 to stage-aosp-master 
Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419
 2015-09-23 19:31:44 -07:00
Dan Willemsen
418868a488 am a0af56f6: am bd1b9e33: Merge "Sort all files found via " 
* commit 'a0af56f6989d250f290257967f64f640531472f5':
  Sort all files found via $(shell find)
 2015-09-24 02:30:40 +00:00
Dan Willemsen
30dc4d2582 am 04df6551: am b6a3ede5: Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG" 
* commit '04df6551922c6ebc5c40a08df9ab21b72e81a6b2':
  Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG
 2015-09-24 02:30:38 +00:00
Dan Willemsen
0d1d74e4e6 am 6ad76ef5: am 58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS" 
* commit '6ad76ef571d8eb1e66244f6abe010ccd76876cf0':
  Don't add CFLAGS to CPPFLAGS
 2015-09-24 02:30:37 +00:00
Dan Willemsen
a0af56f698 am bd1b9e33: Merge "Sort all files found via " 
* commit 'bd1b9e3332de46e1f08b4b5ca8f53d0a096b4793':
  Sort all files found via $(shell find)
 2015-09-24 02:20:39 +00:00
Dan Willemsen
04df655192 am b6a3ede5: Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG" 
* commit 'b6a3ede5506bec89618519bf4a8adb635e570e89':
  Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG
 2015-09-24 02:20:38 +00:00
Dan Willemsen
6ad76ef571 am 58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS" 
* commit '58350dee77bbfadaea7bce9ee83555dba4963d92':
  Don't add CFLAGS to CPPFLAGS
 2015-09-24 02:20:36 +00:00
Ying Wang
964f06b178 Merge "Re-implement mma/mmma using make goals." 2015-09-24 01:20:05 +00:00
Dan Willemsen
bd1b9e3332 Merge "Sort all files found via $(shell find)" 2015-09-24 00:55:27 +00:00
Dan Willemsen
b6a3ede550 Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG" 2015-09-24 00:42:26 +00:00
Dan Willemsen
58350dee77 Merge "Don't add CFLAGS to CPPFLAGS" 2015-09-24 00:23:27 +00:00
Dan Albert
e166febbbc am ded3f15e: am 782b98ea: Merge changes I3ca9ed36,Ibd7eec5c 
* commit 'ded3f15eeb5d8a29bd8b5b325bf9d4bc6c4a6ecc':
  Revert "Default to hiding libgcc symbols in each object."
  Revert "Don't apply --exclude-libs for the host."
 2015-09-23 23:53:06 +00:00
Dan Albert
ded3f15eeb am 782b98ea: Merge changes I3ca9ed36,Ibd7eec5c 
* commit '782b98eaa1c02d935b338f7317fef139067291bb':
  Revert "Default to hiding libgcc symbols in each object."
  Revert "Don't apply --exclude-libs for the host."
 2015-09-23 23:47:37 +00:00
Dan Willemsen
c339398581 Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG 
The darwin version doesn't have a trailing slash. The common case is to
append a path to it:

  $(HOST_TOOLCHAIN_FOR_CLANG)/lib/...

Which means we end up with two slashes.

Change-Id: I74e88924ecfd092c5f7871e188ede0aab29cf65b
 2015-09-23 23:46:44 +00:00
Ying Wang
caeaa08f9d Re-implement mma/mmma using make goals. 
Previously we use command line variable BUILD_MODULES_IN_PATHS which
causes kati to regenerate build.ninja if any variable value changes.

TODO: Remove the old rules of BUILD_MODULES_IN_PATHS in
build/core/main.mk and ninja.mk once users have re-sourced envsetup.sh.
Probably in a few weeks.

Caveat: With this change, if a user sources the new envsetup.sh, mma/mmma
won't work in old branches from the same shell.

Bug: 24309760
Change-Id: I212e82aeebaaa2bd4114e2066f1995da8886b5e2
 2015-09-23 16:31:02 -07:00
Dan Willemsen
3ad3549519 Don't add CFLAGS to CPPFLAGS 
Except for kati, we never use COMMON_GLOBAL_CPPFLAGS without also using
COMMON_GLOBAL_CFLAGS, which leads to duplicate command line entries.

Change-Id: I25d625924e9d157175a9e88bc3f15b7214cfb4ed
 2015-09-23 16:23:02 -07:00
Dan Albert
b77aedbf1e Revert "Default to hiding libgcc symbols in each object." 
This reverts commit 021b7651a5.

Bug: http://b/24166967
Change-Id: I3ca9ed36fa3b55c7eb129c209903676879720acd
 2015-09-23 16:18:18 -07:00
Dan Albert
31927f76a3 Revert "Don't apply --exclude-libs for the host." 
This reverts commit 1576da248c.

Bug: http://b/24166967
Change-Id: Ibd7eec5c261e85a0474243991be7ee1860c9e14d
 2015-09-23 16:18:03 -07:00
Dan Willemsen
4d66adfd0e Sort all files found via $(shell find) 
Don't rely on filesystem ordering to make these the same for all builds.

Change-Id: I7313062157764091acecf45f4b57405c28858546
 2015-09-23 15:35:52 -07:00
Colin Cross
b49b22d1b3 am 48a368d1: am 87e0e8a7: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"" 
* commit '48a368d1c68c35716e286cec916bf093f9f2da34':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
 2015-09-23 22:07:37 +00:00
Colin Cross
48a368d1c6 am 87e0e8a7: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"" 
* commit '87e0e8a7642bd1f5bfdb7b8313df60a77119690a':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
 2015-09-23 22:00:23 +00:00
Colin Cross
87e0e8a764 Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"" 2015-09-23 21:53:08 +00:00
Colin Cross
84a8ca3173 Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
If there are any goals on the command line, kati hides targets that are
not dependencies of those goals.  Revert this until kati is modified to
include all targets.

This reverts commit b71d24931c.

Bug: 24339367
Change-Id: I7c3a950aef8efc9a0eb72bd29ee07710d2faca99
 2015-09-23 21:49:27 +00:00
Colin Cross
99042281ce am b4b65dbc: am f8579330: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit 'b4b65dbcdbabe25f33342e44e5891bbb1fc7e3ed':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-23 21:08:04 +00:00
Colin Cross
b4b65dbcdb am f8579330: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit 'f8579330a5f6dea88a4d96e4d34ec165a7563030':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-23 21:03:03 +00:00
Bill Yi
3492be80e1 Merge "Restore AOSP-style version numbers - DO NOT MERGE" into stage-aosp-master 2015-09-23 20:54:42 +00:00
Colin Cross
f8579330a5 Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 2015-09-23 20:54:16 +00:00
Dan Albert
bbf62b44b5 am 84a50003: am a41dd0a9: Merge "Don\'t apply --exclude-libs for the host." 
* commit '84a500039db9f77973ef9bfe0955df4eaa2244dc':
  Don't apply --exclude-libs for the host.
 2015-09-23 20:48:15 +00:00
Dan Albert
84a500039d am a41dd0a9: Merge "Don\'t apply --exclude-libs for the host." 
* commit 'a41dd0a973ad9b890a4e2fe558ad6ed038bacdef':
  Don't apply --exclude-libs for the host.
 2015-09-23 20:42:33 +00:00
Dan Albert
1576da248c Don't apply --exclude-libs for the host. 
The Mac linker doesn't support this flag, and we don't actually need
it there anyway because we link dynamically to the system's compiler
runtime lib.

Bug: http://b/24166967
Change-Id: I62a926ed39d9fc487638e0c1a172762503dd633e
 2015-09-23 13:32:14 -07:00
Dan Albert
3677ab8e07 am 0b8113ee: am c496b259: Merge "Default to hiding libgcc symbols in each object." 
* commit '0b8113ee089bc1fa431d0a119e4f9a2182e4f859':
  Default to hiding libgcc symbols in each object.
 2015-09-23 20:22:05 +00:00
Dan Albert
0b8113ee08 am c496b259: Merge "Default to hiding libgcc symbols in each object." 
* commit 'c496b259b8dddf0eac71a50f5e258da4a353d6bb':
  Default to hiding libgcc symbols in each object.
 2015-09-23 20:15:37 +00:00
Dan Albert
c496b259b8 Merge "Default to hiding libgcc symbols in each object." 2015-09-23 20:08:09 +00:00
Bill Yi
5a2f585d82 Restore AOSP-style version numbers - DO NOT MERGE 
Change-Id: Icc9bc2c03d47e1c02d3b535719862e55a9f9b7cd
 2015-09-23 12:38:58 -07:00
Ying Wang
8767ff3bb8 am f695144f: am 56dca5b5: Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long." 
* commit 'f695144fd450b5b38a652ac8af985dbb17f2c3e7':
  Use md5sum as the build.ninja filename suffix if the suffix gets too long.
 2015-09-22 23:57:24 +00:00
Ying Wang
f695144fd4 am 56dca5b5: Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long." 
* commit '56dca5b5408834ff36455d8112e737e968bb6320':
  Use md5sum as the build.ninja filename suffix if the suffix gets too long.
 2015-09-22 23:50:34 +00:00
Dan Albert
021b7651a5 Default to hiding libgcc symbols in each object. 
Bug: http://b/24166967
Change-Id: I3dba264ae70a2e13b3edee7575139e86ef49be71
 2015-09-22 16:49:28 -07:00
Ying Wang
127da9e4aa Use md5sum as the build.ninja filename suffix if the suffix gets too long. 
Use md5sum as the build.ninja filename suffix if the suffix is longer
than 64 characters. Also store the original suffix in a corresponding
.suf file for human lookup.
This fixes the "File name too long" error when kati tries to write to
build.ninja with the long original suffix.

Bug: 24302576
Change-Id: Ie04b0c14e1a9d593aa5c2a6b357b19a9e8a7158e
 2015-09-22 16:16:12 -07:00
Colin Cross
b71d24931c Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS 
Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.

Change-Id: I28788a3409d601fe838749bcf15394bc8f3d775b
 2015-09-22 14:24:00 -07:00
Ying Wang
f0f8bc2118 am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package." 
* commit 'd6679fbc7e3fdafa4b8b2f554f5f53fef00af696':
  Don't build otatools.zip if we don't build the ota package.
 2015-09-22 18:56:57 +00:00
Ying Wang
d6679fbc7e am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package." 
* commit '9412efdc1b9f54e1bc8df3ea3e8e34b7d899cc70':
  Don't build otatools.zip if we don't build the ota package.
 2015-09-22 18:50:52 +00:00
Ying Wang
bd2d024778 Don't build otatools.zip if we don't build the ota package. 
Also added flag TARGET_SKIP_OTA_PACKAGE to allow product to skip ota
package.

Bug: 24295339
Change-Id: Ib613ed747528661a6572b577cd54ccb6c2d1fdc8
 2015-09-22 11:41:59 -07:00
Colin Cross
8c33b95205 am 425d0248: am 9ff24387: Merge "Make USE_NINJA=true the default" 
* commit '425d0248a1949208de7b715155ad0d6036c46bc1':
  Make USE_NINJA=true the default
 2015-09-22 17:22:03 +00:00
Colin Cross
425d0248a1 am 9ff24387: Merge "Make USE_NINJA=true the default" 
* commit '9ff24387c205da60e3d7deb042530b1d0b2d881c':
  Make USE_NINJA=true the default
 2015-09-22 17:12:43 +00:00
Colin Cross
9ff24387c2 Merge "Make USE_NINJA=true the default" 2015-09-22 17:05:22 +00:00
Zach Jang
1a78a8e7fb Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA 
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
 2015-09-21 17:42:49 -07:00
Ying Wang
b79e8771ae Don't add build number to apps' version name for platform build. 
Bug: 24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
 2015-09-21 15:13:09 -07:00
Dan Albert
d897bc6e10 am 1721cbcb: am 30b32620: Merge "Revert "Don\'t re-export libgcc symbols from every object."" 
* commit '1721cbcb0d929ac4cb7d50898f714f30e020b967':
  Revert "Don't re-export libgcc symbols from every object."
 2015-09-21 19:51:01 +00:00
Dan Albert
1721cbcb0d am 30b32620: Merge "Revert "Don\'t re-export libgcc symbols from every object."" 
* commit '30b326206ba0148da32c1419f210bd6e6890236d':
  Revert "Don't re-export libgcc symbols from every object."
 2015-09-21 19:40:55 +00:00
Dan Albert
30b326206b Merge "Revert "Don't re-export libgcc symbols from every object."" 2015-09-21 19:20:24 +00:00
Dan Albert
5408ff73d6 Revert "Don't re-export libgcc symbols from every object." 
For some reason shamu doesn't boot after this change.

Bug: http://b/24166967

This reverts commit e92d25f296.

Change-Id: Ibd90c0fccb1fe7446f959c937963d1aa4e43c37c
 2015-09-21 19:19:02 +00:00
Ying Wang
697c61d88e am 197e592e: am 3c4c3418: Merge "Don\'t add build number to apps\' version name for platform build." 
* commit '197e592ea5d08353b0e3586a7523df86b9cb929c':
  Don't add build number to apps' version name for platform build.
 2015-09-20 03:49:39 +00:00
Ying Wang
197e592ea5 am 3c4c3418: Merge "Don\'t add build number to apps\' version name for platform build." 
* commit '3c4c34183a10fd3deac81a8fc1fed8c774f12190':
  Don't add build number to apps' version name for platform build.
 2015-09-20 03:41:43 +00:00
Colin Cross
7f908a438b am a084f2c7: am 0881ce18: Merge changes Ic1be7572,Id6481430 
* commit 'a084f2c73b905ab4906eb5e7aad593bd6fa222e6':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
 2015-09-19 19:59:59 +00:00
Christopher Ferris
b00b6416cb am 2649e750: am 9bc462c1: Merge "Add the common directory back to kernel headers." 
* commit '2649e750b6a5a846c8014b0117670f4d15b28684':
  Add the common directory back to kernel headers.
 2015-09-19 19:59:58 +00:00
Colin Cross
a084f2c73b am 0881ce18: Merge changes Ic1be7572,Id6481430 
* commit '0881ce1817395d62d2746a14350767bf411f89d4':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
 2015-09-19 19:52:44 +00:00
Christopher Ferris
2649e750b6 am 9bc462c1: Merge "Add the common directory back to kernel headers." 
* commit '9bc462c12a5c4519b00e988b738c029c688c12d5':
  Add the common directory back to kernel headers.
 2015-09-19 19:52:16 +00:00
Ying Wang
d75d893da8 Don't add build number to apps' version name for platform build. 
Bug: 24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
 2015-09-19 10:56:35 -07:00
Colin Cross
0881ce1817 Merge changes Ic1be7572,Id6481430 
* changes:
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
 2015-09-18 23:33:59 +00:00
Colin Cross
f77030bb30 Make USE_NINJA=true the default 
Build with kati + ninja by default, unless specifically disabled with
USE_NINJA=false in the environment or on the make command line.

Bug: 23565895
Change-Id: I1fa9f5c6eb4d4ed3f5b81454f89d19fd2f1f6abb
 2015-09-18 15:10:21 -07:00
Colin Cross
af6c071a5f Pass --ninja to makeparallel for ninja 
When parallelism is being handled by ninja, pass --ninja to makeparallel
to have it translate -j with no number to default ninja parallelism, and
-k to -k0.

Bug: 24199503
Change-Id: Ic1be7572f93b33e4a71ed23e9e73dea1d4255703
 2015-09-18 15:02:40 -07:00
Christopher Ferris
9bc462c12a Merge "Add the common directory back to kernel headers." 2015-09-18 20:44:58 +00:00
Evgenii Stepanov
1cb3285e8d am f267f714: am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing." 
* commit 'f267f7147fe74b6d523b8f3b700bef276f2782bb':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
 2015-09-18 20:41:48 +00:00
Evgenii Stepanov
f267f7147f am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing." 
* commit '908260a56631cad51196c7b197f720bc88d7f5c7':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
 2015-09-18 20:31:54 +00:00
Evgenii Stepanov
908260a566 Merge "Add support of SANITIZE_TARGET='address coverage' for fuzzing." 2015-09-18 20:21:54 +00:00
Ivan Krasin
74b32b8dfc Add support of SANITIZE_TARGET='address coverage' for fuzzing. 
Also, add trace-cmp instrumentation to fuzz_test and host_fuzz_test.

Bug: 22850550
Change-Id: Ifff7b8be693ae991feb0a64e19439370a19b2748
 2015-09-18 11:54:43 -07:00
Dan Albert
823a9c8c47 am 5397ba55: am 000e1a97: Merge "Don\'t re-export libgcc symbols from every object." 
* commit '5397ba55840162c7e1ae833320bcdcd6140b6c2a':
  Don't re-export libgcc symbols from every object.
 2015-09-18 17:35:56 +00:00
Dan Albert
5397ba5584 am 000e1a97: Merge "Don\'t re-export libgcc symbols from every object." 
* commit '000e1a973ec83cb2af644ce72a46f1c026299a7d':
  Don't re-export libgcc symbols from every object.
 2015-09-18 17:29:22 +00:00
Dan Albert
000e1a973e Merge "Don't re-export libgcc symbols from every object." 2015-09-18 17:21:13 +00:00
Christopher Ferris
6a2f28514c Add the common directory back to kernel headers. 
There will only be a very small set of non-uapi headers. This is
mostly being done for the scsi headers since the kernel has not
made uapi versions of all of them.

Change-Id: I44904b07ff96de918dc5fcab4e5f117a34cb2a87
 2015-09-17 21:20:03 -07:00
Dan Albert
e92d25f296 Don't re-export libgcc symbols from every object. 
Target modules shouldn't re-export libgcc.a because we don't want
other binaries importing them when they should be getting their own
copy of the builtins.

Bug: http://b/24166967
Change-Id: Iaa208933885375da4a8e1b8935f76e9f3ea0647f
 2015-09-17 17:18:12 -07:00
Scott James Remnant
e9d4b29272 am d8f08571: am 909fe8e0: Merge "build: support compiling .mm on host" 
* commit 'd8f08571b3ce2161076be665e593fb993c48464a':
  build: support compiling .mm on host
 2015-09-17 23:26:06 +00:00
Scott James Remnant
d8f08571b3 am 909fe8e0: Merge "build: support compiling .mm on host" 
* commit '909fe8e0f7da8db09a004ef44a90e786c81df5e4':
  build: support compiling .mm on host
 2015-09-17 23:15:30 +00:00
Scott James Remnant
dd86e5a0de build: support compiling .mm on host 
libchrome uses .mm (Objective-C++) files to bridge C++ code with
OS X Frameworks. This adds support for compiling .mm to .o by just
using the existing C++ support.

Bug: 24168923
Change-Id: Ia65357e2e2584dfffcb6796e214fe6b27635c3a6
 2015-09-17 15:51:32 -07:00
Dan Albert
0c24a1ff90 am d9f9836e: am 3ee9daac: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG." 
* commit 'd9f9836e5e0e3b6aae2e1289486b9be7dc7dda5a':
  Remove WITHOUT_(HOST|TARGET)_CLANG.
 2015-09-16 23:40:38 +00:00
Dan Albert
d9f9836e5e am 3ee9daac: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG." 
* commit '3ee9daac6a3bf8d2a9030b99f62595330f22cafa':
  Remove WITHOUT_(HOST|TARGET)_CLANG.
 2015-09-16 23:31:41 +00:00
Ying Wang
58de128998 am bc195b36: am 6fb36397: Merge "Use /ninja_build to mark ninja build." 
* commit 'bc195b36d7fa0cbd35d12449d37f8aefb60ea946':
  Use $(OUT_DIR)/ninja_build to mark ninja build.
 2015-09-16 23:26:41 +00:00
Dan Albert
3ee9daac6a Merge "Remove WITHOUT_(HOST|TARGET)_CLANG." 2015-09-16 23:24:40 +00:00
Ying Wang
bc195b36d7 am 6fb36397: Merge "Use /ninja_build to mark ninja build." 
* commit '6fb36397e56336e08a75e7101d6d47a98a27aea1':
  Use $(OUT_DIR)/ninja_build to mark ninja build.
 2015-09-16 23:21:04 +00:00
Dan Albert
32f7ff14ce Remove WITHOUT_(HOST|TARGET)_CLANG. 
This is unused.

Change-Id: Ibc461fef02c82d110718003aceffb943c930ffe6
 2015-09-16 15:43:00 -07:00
Ying Wang
eb1e18e689 Use $(OUT_DIR)/ninja_build to mark ninja build. 
Bug: 23565895
Change-Id: I000e88a45278fd52096312262eacc52511f02efb
 2015-09-16 15:29:08 -07:00
Ying Wang
8b037b6765 am 942672d8: am 45075cf6: Merge "Generate installed-files-vendor.txt" 
* commit '942672d82b7be88c252ff4c979039eb40349cef0':
  Generate installed-files-vendor.txt
 2015-09-15 23:21:11 +00:00
Ying Wang
942672d82b am 45075cf6: Merge "Generate installed-files-vendor.txt" 
* commit '45075cf623fc59930594ac27c675cd43e36975b1':
  Generate installed-files-vendor.txt
 2015-09-15 23:10:16 +00:00
Ying Wang
8da19e3688 Generate installed-files-vendor.txt 
Similar to installed-files.txt, installed-files-vendor.txt lists the
content of vendor.img.

Bug: 24009297
Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
 2015-09-15 14:24:00 -07:00
Dan Willemsen
60d1341d22 am ca72e5eb: am b384eb84: Merge "kati: Handle MAKECMDGOALS modifications" 
* commit 'ca72e5eb6115570207a044c146fbdca07257c642':
  kati: Handle MAKECMDGOALS modifications
 2015-09-15 00:42:05 +00:00
Dan Willemsen
ca72e5eb61 am b384eb84: Merge "kati: Handle MAKECMDGOALS modifications" 
* commit 'b384eb84c3bbea9630d805f5825320e7f9acc2ba':
  kati: Handle MAKECMDGOALS modifications
 2015-09-15 00:35:13 +00:00
Colin Cross
b690d4e955 am e173cb8b: am 4ce3cea7: Merge changes I6e4f957c,Id41a2d81 
* commit 'e173cb8b38ab2ac8eb1b5373eb2987516aacdeb3':
  Use makeparallel to propagate -j flag to ninja or kati
  Implement makeparallel
 2015-09-15 00:30:41 +00:00
Dan Willemsen
b384eb84c3 Merge "kati: Handle MAKECMDGOALS modifications" 2015-09-15 00:28:42 +00:00
Colin Cross
e173cb8b38 am 4ce3cea7: Merge changes I6e4f957c,Id41a2d81 
* commit '4ce3cea77065396b81a4e50283b785e9cc64788f':
  Use makeparallel to propagate -j flag to ninja or kati
  Implement makeparallel
 2015-09-15 00:25:06 +00:00
Dan Willemsen
cb1bd116ed kati: Handle MAKECMDGOALS modifications 
For some special targets (PRODUCT-%), the MAKECMDGOALS variable is
modified. Before this change, using one would result in a "no rule to
make target" error, since the new target was not stubbed out.

Change-Id: I879642a48b84a66789d4bdb7db1b6fd1130819b7
 2015-09-14 16:30:51 -07:00
Colin Cross
f7ca64faa0 Use makeparallel to propagate -j flag to ninja or kati 
When USE_NINJA=true is set, use makeparallel to claim all jobs from make and
pass them to ninja with -j.  If USE_GOMA is set, pass the -j flag to
kati instead so the parallelism can be set in the local_pool instead.

Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
 2015-09-14 14:41:00 -07:00
Dan Albert
81abed9134 am 91a0082f: am da196abf: Merge "Fix LOCAL_CXX_STL := none for Windows." 
* commit '91a0082fbc69ab77931ec58ea5a5fbf58331d8a5':
  Fix `LOCAL_CXX_STL := none` for Windows.
 2015-09-11 23:05:35 +00:00
Dan Albert
91a0082fbc am da196abf: Merge "Fix LOCAL_CXX_STL := none for Windows." 
* commit 'da196abf10fd9a500fe223952d96cf93ed699983':
  Fix `LOCAL_CXX_STL := none` for Windows.
 2015-09-11 22:14:30 +00:00
Dan Albert
d1d68b19ac Fix LOCAL_CXX_STL := none for Windows. 
We still need to link the various MSVC libraries even if we aren't
using the STL.

Bug: http://b/22953515
Change-Id: I73c35710a6162408e99480a4840eedd291adf7ab
 2015-09-11 13:37:51 -07:00
Shinichiro Hamaji
b94d93e587 am 4bbf8fae: am 6d20af03: Merge "Use the same build.ninja for normal make targets" 
* commit '4bbf8fae1605964b53d32d54db31fbd29db473e7':
  Use the same build.ninja for normal make targets
 2015-09-10 03:44:04 +00:00
Shinichiro Hamaji
4bbf8fae16 am 6d20af03: Merge "Use the same build.ninja for normal make targets" 
* commit '6d20af0391569a2f7b70a6816ddaf316b15e5a70':
  Use the same build.ninja for normal make targets
 2015-09-10 03:37:24 +00:00
Shinichiro Hamaji
6d20af0391 Merge "Use the same build.ninja for normal make targets" 2015-09-10 03:31:59 +00:00
Dan Willemsen
3ff90073e5 am abf6d7a3: am 96d3c0d0: Merge "Update the build system doc" 
* commit 'abf6d7a3c554a95e48fe82f4af44a0960373b904':
  Update the build system doc
 2015-09-10 01:02:15 +00:00
Dan Willemsen
abf6d7a3c5 am 96d3c0d0: Merge "Update the build system doc" 
* commit '96d3c0d0b14e94583438d9e93f011b1b0c930e38':
  Update the build system doc
 2015-09-10 00:53:08 +00:00
Dan Willemsen
0b6c3481d5 Update the build system doc 
This adds a reference to the _{32|64|arm|arm64|...|darwin|linux|windows}
variables, and adds information about how LOCAL_MODULE_HOST_OS works.

It also removes many (but not all) obsolete references.

Bug: 23566667
Change-Id: Ief16a5e245eb65ac00fc23d4fc1b7a409a7a64bd
 2015-09-10 00:20:12 +00:00
Dan Willemsen
8581a8f085 am 749e07c6: am c8db47a0: Merge "Don\'t build windows modules with clang, fix flags" 
* commit '749e07c6483b946ae87ff5efb44460354fb2adf5':
  Don't build windows modules with clang, fix flags
 2015-09-09 23:44:44 +00:00
Dan Willemsen
749e07c648 am c8db47a0: Merge "Don\'t build windows modules with clang, fix flags" 
* commit 'c8db47a0213aa5c204c140cb9268389b4175ae06':
  Don't build windows modules with clang, fix flags
 2015-09-09 23:25:11 +00:00
Dan Willemsen
7728817ab9 Don't build windows modules with clang, fix flags 
shamu checkbuilds set USE_CLANG_PLATFORM_BUILD, which shouldn't apply to
modules built for windows. Also fix some flags that were being set
improperly.

Bug: 23566667
Change-Id: Id4c5b7cc59966328483d90f2b7be3f35e439ecee
 2015-09-09 16:10:50 -07:00
Dan Willemsen
3cf749c78a am c98d9a9d: am f1c09d7f: Merge "Add HOST_CROSS_OS" 
* commit 'c98d9a9d0ff4ae5a99d45d79c43699c302e4e1a3':
  Add HOST_CROSS_OS
 2015-09-09 18:31:08 +00:00
Dan Albert
f5db972506 am 4ecedbc8: am feb3ecaf: Merge "Fix name for NDK protobuf libraries." 
* commit '4ecedbc823f879b78a9c4e7ff25be20a12848d13':
  Fix name for NDK protobuf libraries.
 2015-09-09 18:31:07 +00:00
Dan Willemsen
c98d9a9d0f am f1c09d7f: Merge "Add HOST_CROSS_OS" 
* commit 'f1c09d7fbd92a08cc51950a7d35fb5f7fc564a20':
  Add HOST_CROSS_OS
 2015-09-09 18:19:13 +00:00
Dan Albert
4ecedbc823 am feb3ecaf: Merge "Fix name for NDK protobuf libraries." 
* commit 'feb3ecaff02d2bddb82aae0fa3024d9b9a62169e':
  Fix name for NDK protobuf libraries.
 2015-09-09 18:19:11 +00:00
Dan Willemsen
f1c09d7fbd Merge "Add HOST_CROSS_OS" 2015-09-09 18:13:21 +00:00
Dan Willemsen
057aaea54a Add HOST_CROSS_OS 
Instead of using recursive make to change the HOST_OS when building the
windows SDK under linux, add the concept of cross-building to another
host os.

Bug: 23566667
Change-Id: I6dc525b601b6251d458d197c30bf4660d7485502
 2015-09-09 18:12:29 +00:00
Shinichiro Hamaji
d762bcae25 Use the same build.ninja for normal make targets 
$(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect
parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))).
If the make targets contain one of them, we keep using a
different build.ninja for each combination of make targets.
Otherwise, we use the same build.ninja which has all phony
targets.

Also load vendor/google/build/ninja_config.mk so it can add
Google-specific goals to $(PARSE_TIME_MAKE_GOALS).

Bug: 23685536
Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
 2015-09-09 15:48:10 +09:00
Dan Albert
a187fb5986 Fix name for NDK protobuf libraries. 
Name them *-ndk so it's clear which library is which.

Change-Id: I53544a8a97488f902e00d1aedaa021d09ee2f649
 2015-09-08 10:47:03 -07:00
Shinichiro Hamaji
606edc4447 am ebbea4f4: am e711afb1: Merge "Use as a part of ninja suffix" 
* commit 'ebbea4f4e89db421d2f6de4338e2f0c0f5818946':
  Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
 2015-09-07 05:53:43 +00:00
Shinichiro Hamaji
ebbea4f4e8 am e711afb1: Merge "Use as a part of ninja suffix" 
* commit 'e711afb154333407fe42e8ffe36bf76448d4f80f':
  Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
 2015-09-07 05:44:30 +00:00
Shinichiro Hamaji
e711afb154 Merge "Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix" 2015-09-07 05:38:24 +00:00
Dan Willemsen
1376c2f812 am f41a670d: am 76274670: Merge "Fix LOCAL_MODULE_HOST_OS" 
* commit 'f41a670d51559afb51e14890db12d85cc0a59aa2':
  Fix LOCAL_MODULE_HOST_OS
 2015-09-05 01:36:50 +00:00
Dan Willemsen
f41a670d51 am 76274670: Merge "Fix LOCAL_MODULE_HOST_OS" 
* commit '762746705c7414985dbd457481dd33d4c69adcbb':
  Fix LOCAL_MODULE_HOST_OS
 2015-09-05 01:29:56 +00:00
Shinichiro Hamaji
909e7f40ae Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix 
So that switching between two different mmma targets won't
need regenerating ninja files.

Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
 2015-09-05 09:00:19 +09:00
Dan Willemsen
ed635cfc0d Fix LOCAL_MODULE_HOST_OS 
Make sure LOCAL_IS_HOST_MODULE is set before including
module_arch_supported.mk

Bug: 23566667
Change-Id: I28ef10f093407eb3a6a83574ecc3f098eb775241
 2015-09-04 15:41:38 -07:00
Ying Wang
6f2e72ec99 am cbac8789: am af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk." 
* commit 'cbac87899b63bfbd9bf9f23e16b3ac2faba7d39c':
  Move part of logtags stuff back to base_rules.mk.
 2015-09-04 18:02:31 +00:00
Ying Wang
cbac87899b am af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk." 
* commit 'af72e1b3e68f449c81054bc25e655016529914e1':
  Move part of logtags stuff back to base_rules.mk.
 2015-09-04 17:56:24 +00:00
Yasuhiro Matsuda
ff82e82a1e Move part of logtags stuff back to base_rules.mk. 
Otherwise event tags for non-Java modules
(e.g. logcat, libsurfaceflinger) are not generated.

BUG: 23803975
Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
 2015-09-04 20:02:49 +09:00
Dan Willemsen
1205f2d953 am f18345af: am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS" 
* commit 'f18345af74ad00d057adad89b1d154471ebf118f':
  Add LOCAL_MODULE_HOST_OS
 2015-09-04 01:39:49 +00:00
Dan Willemsen
f18345af74 am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS" 
* commit '4379e2b8bbaf2a02777f189c758e251015eb7f76':
  Add LOCAL_MODULE_HOST_OS
 2015-09-04 01:31:22 +00:00
Dan Willemsen
859ac34064 Add LOCAL_MODULE_HOST_OS 
Instead of wrapping a host module definition in 'ifeq($(HOST_OS),...)'
in the Android.mk files, define which hosts are supported using
LOCAL_MODULE_HOST_OS.

A blank LOCAL_MODULE_HOST_OS means that linux and darwin are supported.
A non-empty LOCAL_MODULE_HOST_OS lists the supported HOST_OSs.

Change-Id: I1e342d1908cfa00aef2c39c145b4f5f81c373bc6
 2015-09-03 16:40:51 -07:00
Zach Jang
ea9ea8fafb am cf7e78cc: am 36890dac: am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev 
* commit 'cf7e78cca06b3edc17270eb3bf6715126afd98da':
  Set the Security Patch level with Oct 1 for MNC
 2015-09-03 04:23:44 +00:00
Ying Wang
08f82e9b33 am 119cec9a: am 4e2f1903: Merge "Clean up Javac a little bit." 
* commit '119cec9a4a8792d6c5efd5f126d8c8e3fd7f90d5':
  Clean up Javac a little bit.
 2015-09-02 21:29:53 +00:00
Ying Wang
119cec9a4a am 4e2f1903: Merge "Clean up Javac a little bit." 
* commit '4e2f190315759b4270ab414b9ff1e24a19521521':
  Clean up Javac a little bit.
 2015-09-02 21:18:38 +00:00
Ying Wang
4e2f190315 Merge "Clean up Javac a little bit." 2015-09-02 20:48:50 +00:00
Evgenii Stepanov
cfa73b45c2 am d259ecd1: am 617770c1: Merge "Add AddressSanitizer linker flags for x86." 
* commit 'd259ecd171ad9a7d85d0ba44669fcb62bde342ae':
  Add AddressSanitizer linker flags for x86.
 2015-09-02 20:23:26 +00:00
Evgenii Stepanov
d259ecd171 am 617770c1: Merge "Add AddressSanitizer linker flags for x86." 
* commit '617770c133330fc06070e97ce39bbf065c749c97':
  Add AddressSanitizer linker flags for x86.
 2015-09-02 20:18:12 +00:00
Ivan Krasin
b83e171c8d Add AddressSanitizer linker flags for x86. 
This is the 1/4 change required to get AddressSanitizer
for Android x86 to work.

Change-Id: I848805af34fdd32a313c991504d6014f9b97ab88
 2015-09-02 11:59:45 -07:00
Ying Wang
447d69678e Clean up Javac a little bit. 
- Added GLOBAL_JAVAC_DEBUG_FLAGS and merge it to
  PRIVATE_JAVACFLAGS/PRIVATE_JACK_FLAGS to get rid of
  PRIVATE_JAVAC_DEBUG_FLAGS/PRIVATE_JACK_DEBUG_FLAGS.
- With Java rules out of base_rules.mk we can get rid
  of java_alternative_checked_module now.

Change-Id: I1a14716c785e3d49330a75044107662ce96a9307
 2015-09-02 10:04:18 -07:00
Shinichiro Hamaji
a7216a683c am 86de0212: am e1b9123d: Merge "Set --ninja_suffix based on make/mm/mmm targets" 
* commit '86de02120dbda1a11d5ad05b55debcf05b55131e':
  Set --ninja_suffix based on make/mm/mmm targets
 2015-09-02 00:15:51 +00:00
Shinichiro Hamaji
86de02120d am e1b9123d: Merge "Set --ninja_suffix based on make/mm/mmm targets" 
* commit 'e1b9123d51f20543fd13ebd611c9c2fe92ecaf9c':
  Set --ninja_suffix based on make/mm/mmm targets
 2015-09-02 00:04:45 +00:00
Zach Jang
9f7c37811b am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev 
* commit '057831bc665b15d7beda970b91b2c332dee417f0':
  Set the Security Patch level with Oct 1 for MNC
 2015-09-02 00:04:40 +00:00
Shinichiro Hamaji
bfd01872cb Set --ninja_suffix based on make/mm/mmm targets 
This fixes two issues:

- Switching make target didn't work well when the latter
  make target is not a subset of the first make target.
- Switching between m and mm/mmm forced build.ninja to be
  regenerated.

Bug: 23685536

Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
 2015-09-02 07:37:39 +09:00
Tao Bao
ccad82c52e Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev 2015-09-01 19:02:24 +00:00
Shinichiro Hamaji
fd69b5582e am 565b95fb: am ec8f9731: Merge "Show error message when resource limit too low for USE_GOMA=true" 
* commit '565b95fbb8363652955ef3ecdd1bf122c3f0afbd':
  Show error message when resource limit too low for USE_GOMA=true
 2015-09-01 16:43:50 +00:00