Commit Graph

8323 Commits

Author SHA1 Message Date
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