OSDN Git Service
Steve Fung [Mon, 28 Sep 2015 20:24:32 +0000 (20:24 +0000)]
am
562ad0b5: Merge "Package breakpad symbols in target files zip"
* commit '
562ad0b5e4f5d49fc62e72ca1d6eb18acab6e90b':
Package breakpad symbols in target files zip
Steve Fung [Mon, 28 Sep 2015 20:07:55 +0000 (20:07 +0000)]
Merge "Package breakpad symbols in target files zip"
Shinichiro Hamaji [Mon, 28 Sep 2015 04:43:25 +0000 (04:43 +0000)]
am
cf448ddb: Merge "Use gomacc even for FDO build"
* commit '
cf448ddb4f95f511575e56a729e0d60a45d84e1e':
Use gomacc even for FDO build
Shinichiro Hamaji [Mon, 28 Sep 2015 04:38:53 +0000 (04:38 +0000)]
Merge "Use gomacc even for FDO build"
Colin Cross [Sat, 26 Sep 2015 03:37:54 +0000 (03:37 +0000)]
am
581a028f: Merge "Remove checkbuild and test from parse time goals"
* commit '
581a028fb562b1d877de2b82d6a08df045d73ec8':
Remove checkbuild and test from parse time goals
Colin Cross [Sat, 26 Sep 2015 03:33:35 +0000 (03:33 +0000)]
Merge "Remove checkbuild and test from parse time goals"
Shinichiro Hamaji [Thu, 24 Sep 2015 08:51:20 +0000 (17:51 +0900)]
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
Steve Fung [Fri, 25 Sep 2015 01:12:33 +0000 (18:12 -0700)]
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
Ying Wang [Sat, 26 Sep 2015 01:06:38 +0000 (01:06 +0000)]
am
094116f0: Merge "Remove the unnecessary rs_compatibility_jni_libs install rules."
* commit '
094116f0374da3dcba3ff1425f0cb42caf1c6d59':
Remove the unnecessary rs_compatibility_jni_libs install rules.
Ying Wang [Sat, 26 Sep 2015 01:00:14 +0000 (01:00 +0000)]
Merge "Remove the unnecessary rs_compatibility_jni_libs install rules."
Colin Cross [Sat, 26 Sep 2015 00:15:44 +0000 (00:15 +0000)]
am
aaa9d8dc: Merge "Fix windows build"
* commit '
aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f':
Fix windows build
Colin Cross [Sat, 26 Sep 2015 00:09:58 +0000 (00:09 +0000)]
Merge "Fix windows build"
Colin Cross [Sat, 26 Sep 2015 00:00:14 +0000 (17:00 -0700)]
Fix windows build
The windows toolchain doesn't support color, only apply
-fdiagnostics-color to HOST and TARGET, not HOST_CROSS.
Change-Id: I17b999a2852b8d70b2d39a58befa10e2e32c4608
Colin Cross [Fri, 25 Sep 2015 23:43:36 +0000 (16:43 -0700)]
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
Colin Cross [Fri, 25 Sep 2015 23:38:29 +0000 (23:38 +0000)]
am
67020d23: Merge "Link libgtest_main before libgtest"
* commit '
67020d2338dd51af5daa3479624acaa494be51a9':
Link libgtest_main before libgtest
Colin Cross [Fri, 25 Sep 2015 23:30:48 +0000 (23:30 +0000)]
Merge "Link libgtest_main before libgtest"
Colin Cross [Fri, 25 Sep 2015 23:17:02 +0000 (23:17 +0000)]
am
0d97557d: Merge "Enable color output from gcc and clang"
* commit '
0d97557d3d6f56cf6dfdb7552d4f1471d56dfabe':
Enable color output from gcc and clang
Ying Wang [Fri, 25 Sep 2015 23:06:48 +0000 (16:06 -0700)]
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
Colin Cross [Fri, 25 Sep 2015 23:11:31 +0000 (16:11 -0700)]
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
Colin Cross [Fri, 25 Sep 2015 23:10:45 +0000 (23:10 +0000)]
Merge "Enable color output from gcc and clang"
Tao Bao [Fri, 25 Sep 2015 21:14:17 +0000 (21:14 +0000)]
am
251d56b8: Merge "releasetools: Update the fingerprint when signing."
* commit '
251d56b851af2159df8139639b4a1a1602d60163':
releasetools: Update the fingerprint when signing.
Tao Bao [Fri, 25 Sep 2015 19:42:28 +0000 (19:42 +0000)]
Merge "releasetools: Update the fingerprint when signing."
Tao Bao [Fri, 11 Sep 2015 22:27:56 +0000 (15:27 -0700)]
releasetools: Update the fingerprint when signing.
ro.bootimage.build.fingerprint should be updated when signing.
Bug:
22720426
Bug:
24009888
Change-Id: Ib246a257581fd31f90ad6b3d21f39d1a2de24ba8
(cherry picked from commit
265d9aeb622c5829787b16b903f028cacaa99c18)
David Turner [Fri, 25 Sep 2015 17:06:22 +0000 (17:06 +0000)]
am
c6444855: Merge "GPU: add gralloc.ranchu library"
* commit '
c64448550a5148489346f7ba3ac0a686b32dbc26':
GPU: add gralloc.ranchu library
David Turner [Fri, 25 Sep 2015 16:59:31 +0000 (16:59 +0000)]
Merge "GPU: add gralloc.ranchu library"
Christopher Ferris [Fri, 25 Sep 2015 16:35:56 +0000 (16:35 +0000)]
am
76ec0c4c: Merge "Set mcpu targets based on cpu variant."
* commit '
76ec0c4c53aab6fca7af1badab882518962a9755':
Set mcpu targets based on cpu variant.
Christopher Ferris [Fri, 25 Sep 2015 16:29:33 +0000 (16:29 +0000)]
Merge "Set mcpu targets based on cpu variant."
Colin Cross [Fri, 25 Sep 2015 05:14:25 +0000 (22:14 -0700)]
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
Shinichiro Hamaji [Fri, 25 Sep 2015 05:31:51 +0000 (05:31 +0000)]
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"
Shinichiro Hamaji [Fri, 25 Sep 2015 05:27:59 +0000 (05:27 +0000)]
Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
Shinichiro Hamaji [Fri, 25 Sep 2015 05:20:42 +0000 (14:20 +0900)]
Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
This reverts commit
cb31f040e304e7d7b2a08d3fd8eceb72c878c37e.
This could be the cause of an internal build breakage.
Change-Id: Ic5d2a2ce1f2d214a8201db5c570682d8336763b9
Shinichiro Hamaji [Fri, 25 Sep 2015 05:07:34 +0000 (05:07 +0000)]
am
4f40525f: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit '
4f40525f782348a64674222be54f5aae3367157c':
Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Shinichiro Hamaji [Fri, 25 Sep 2015 04:59:29 +0000 (04:59 +0000)]
Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Shinichiro Hamaji [Thu, 24 Sep 2015 05:33:27 +0000 (14:33 +0900)]
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
Shinichiro Hamaji [Fri, 25 Sep 2015 04:42:46 +0000 (04:42 +0000)]
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
Shinichiro Hamaji [Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)]
Merge "Make it possible to change the number of remote jobs"
Shinichiro Hamaji [Fri, 25 Sep 2015 04:28:50 +0000 (04:28 +0000)]
am
6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"
* commit '
6b37c7b32af667f6a42b397a27add34d3c59e5fa':
Allow USE_GOMA=true without explicit USE_NINJA=true
Shinichiro Hamaji [Fri, 25 Sep 2015 04:23:28 +0000 (04:23 +0000)]
Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"
Colin Cross [Fri, 25 Sep 2015 01:11:48 +0000 (01:11 +0000)]
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"
Colin Cross [Fri, 25 Sep 2015 01:07:52 +0000 (01:07 +0000)]
Merge "Revert "disable Krait for Mac builds to avoid assembler issues""
Colin Cross [Fri, 25 Sep 2015 00:30:34 +0000 (00:30 +0000)]
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
7c40fb95dc90ed092f435c769b4bbb494d453674.
Bug:
24339250
Change-Id: I8a0da11df42d58ba9c3ded4571f1db870f400a21
Steve Fung [Fri, 25 Sep 2015 00:03:21 +0000 (00:03 +0000)]
am
fdec88c9: Merge "Generate breakpad symbols"
* commit '
fdec88c9726687f98448ccff7670bc843f77bf66':
Generate breakpad symbols
Ying Wang [Thu, 24 Sep 2015 23:59:29 +0000 (23:59 +0000)]
am
92facb1f: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names."
* commit '
92facb1fed26492746aca267df51b6082286521c':
Substitue "/" with "-" in the MODULES-IN phony goal names.
Steve Fung [Thu, 24 Sep 2015 23:57:42 +0000 (23:57 +0000)]
Merge "Generate breakpad symbols"
Ying Wang [Thu, 24 Sep 2015 23:53:24 +0000 (23:53 +0000)]
Merge "Substitue "/" with "-" in the MODULES-IN phony goal names."
Steve Fung [Thu, 24 Sep 2015 08:40:52 +0000 (01:40 -0700)]
Generate breakpad symbols
When BREAKPAD_GENERATE_SYMBOLS is set to true, generate breakpad
symbols for binaries.
Bug:
23900817
Change-Id: I7b992d819350f4f80df5868d16f13016502dfca0
Ying Wang [Thu, 24 Sep 2015 23:19:19 +0000 (16:19 -0700)]
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
Elliott Hughes [Thu, 24 Sep 2015 21:59:58 +0000 (21:59 +0000)]
am
43bbbf8a: Merge "Remove more of the pathmap."
* commit '
43bbbf8a15cfc03ce99d0b6a49992b25cf51fc39':
Remove more of the pathmap.
Elliott Hughes [Thu, 24 Sep 2015 21:50:42 +0000 (21:50 +0000)]
Merge "Remove more of the pathmap."
Dan Albert [Thu, 24 Sep 2015 21:43:54 +0000 (21:43 +0000)]
am
880f05f4: Merge "Use exported includes for libc++."
* commit '
880f05f4f28df672eb4ff4ce6b7735480deb13ae':
Use exported includes for libc++.
Dan Willemsen [Thu, 24 Sep 2015 21:38:46 +0000 (21:38 +0000)]
am
aeaa0f5c: Merge "Turn shared library multilib warnings into errors"
* commit '
aeaa0f5c580356c0d74dd11e00fb29ae67d97f2b':
Turn shared library multilib warnings into errors
Dan Albert [Thu, 24 Sep 2015 21:38:21 +0000 (21:38 +0000)]
Merge "Use exported includes for libc++."
Dan Albert [Wed, 23 Sep 2015 23:16:51 +0000 (16:16 -0700)]
Use exported includes for libc++.
Change-Id: Ia5d9c857a43975448a8c2b489cc29be0fa67ddf6
Christopher Ferris [Fri, 18 Sep 2015 01:49:27 +0000 (18:49 -0700)]
Set mcpu targets based on cpu variant.
Make cortex-a53 and cortex-a53.a57 use cortex-a7.
Change-Id: I89d5b3f044c867ec99aae319eafc33f2edf1f9f2
Dan Willemsen [Thu, 24 Sep 2015 20:59:20 +0000 (20:59 +0000)]
Merge "Turn shared library multilib warnings into errors"
Dan Willemsen [Thu, 24 Sep 2015 20:05:53 +0000 (13:05 -0700)]
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
Miroslav Tisma [Wed, 23 Sep 2015 10:53:41 +0000 (12:53 +0200)]
GPU: add gralloc.ranchu library
Change-Id: I76b21f67e081d82ec76242c051569f32b2b6b638
Ying Wang [Thu, 24 Sep 2015 18:45:23 +0000 (18:45 +0000)]
am
3f107055: Merge "The pattern %tests is too broad."
* commit '
3f10705579deae60d9b903a4587a66a26112ee4a':
The pattern %tests is too broad.
Ying Wang [Thu, 24 Sep 2015 18:40:15 +0000 (18:40 +0000)]
Merge "The pattern %tests is too broad."
Ying Wang [Thu, 24 Sep 2015 18:34:46 +0000 (11:34 -0700)]
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
Elliott Hughes [Thu, 24 Sep 2015 16:02:19 +0000 (09:02 -0700)]
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
Shinichiro Hamaji [Thu, 24 Sep 2015 07:22:44 +0000 (16:22 +0900)]
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
Shinichiro Hamaji [Thu, 24 Sep 2015 06:19:08 +0000 (15:19 +0900)]
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
Ying Wang [Thu, 24 Sep 2015 02:31:44 +0000 (19:31 -0700)]
resolved conflicts for
964f06b1 to stage-aosp-master
Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419
Dan Willemsen [Thu, 24 Sep 2015 02:20:39 +0000 (02:20 +0000)]
am
bd1b9e33: Merge "Sort all files found via "
* commit '
bd1b9e3332de46e1f08b4b5ca8f53d0a096b4793':
Sort all files found via $(shell find)
Dan Willemsen [Thu, 24 Sep 2015 02:20:38 +0000 (02:20 +0000)]
am
b6a3ede5: Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG"
* commit '
b6a3ede5506bec89618519bf4a8adb635e570e89':
Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG
Dan Willemsen [Thu, 24 Sep 2015 02:20:36 +0000 (02:20 +0000)]
am
58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS"
* commit '
58350dee77bbfadaea7bce9ee83555dba4963d92':
Don't add CFLAGS to CPPFLAGS
Ying Wang [Thu, 24 Sep 2015 01:20:05 +0000 (01:20 +0000)]
Merge "Re-implement mma/mmma using make goals."
Dan Willemsen [Thu, 24 Sep 2015 00:55:27 +0000 (00:55 +0000)]
Merge "Sort all files found via $(shell find)"
Dan Willemsen [Thu, 24 Sep 2015 00:42:26 +0000 (00:42 +0000)]
Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG"
Dan Willemsen [Thu, 24 Sep 2015 00:23:27 +0000 (00:23 +0000)]
Merge "Don't add CFLAGS to CPPFLAGS"
Dan Albert [Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)]
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."
Dan Willemsen [Tue, 22 Sep 2015 23:52:18 +0000 (16:52 -0700)]
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
Dan Albert [Wed, 23 Sep 2015 23:42:13 +0000 (23:42 +0000)]
Merge changes I3ca9ed36,Ibd7eec5c
* changes:
Revert "Default to hiding libgcc symbols in each object."
Revert "Don't apply --exclude-libs for the host."
Ying Wang [Wed, 23 Sep 2015 23:08:55 +0000 (16:08 -0700)]
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
Dan Willemsen [Tue, 22 Sep 2015 23:52:58 +0000 (16:52 -0700)]
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
Dan Albert [Wed, 23 Sep 2015 23:17:28 +0000 (16:17 -0700)]
Revert "Default to hiding libgcc symbols in each object."
This reverts commit
021b7651a5fcb806d1b8a767c7f4a0a81bc8e4ff.
Bug: http://b/
24166967
Change-Id: I3ca9ed36fa3b55c7eb129c209903676879720acd
Dan Albert [Wed, 23 Sep 2015 23:17:15 +0000 (16:17 -0700)]
Revert "Don't apply --exclude-libs for the host."
This reverts commit
1576da248c4a061d906778c2c1dac7478abcc510.
Bug: http://b/
24166967
Change-Id: Ibd7eec5c261e85a0474243991be7ee1860c9e14d
Dan Willemsen [Tue, 22 Sep 2015 23:54:12 +0000 (16:54 -0700)]
Sort all files found via $(shell find)
Don't rely on filesystem ordering to make these the same for all builds.
Change-Id: I7313062157764091acecf45f4b57405c28858546
Colin Cross [Wed, 23 Sep 2015 22:00:23 +0000 (22:00 +0000)]
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"
Colin Cross [Wed, 23 Sep 2015 21:53:08 +0000 (21:53 +0000)]
Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
Colin Cross [Wed, 23 Sep 2015 21:48:34 +0000 (21:48 +0000)]
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
b71d24931c7a18799249e3c7f7f6de20ac76cc75.
Bug:
24339367
Change-Id: I7c3a950aef8efc9a0eb72bd29ee07710d2faca99
Colin Cross [Wed, 23 Sep 2015 21:03:03 +0000 (21:03 +0000)]
am
f8579330: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit '
f8579330a5f6dea88a4d96e4d34ec165a7563030':
Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Bill Yi [Wed, 23 Sep 2015 20:54:42 +0000 (20:54 +0000)]
Merge "Restore AOSP-style version numbers - DO NOT MERGE" into stage-aosp-master
Colin Cross [Wed, 23 Sep 2015 20:54:16 +0000 (20:54 +0000)]
Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Dan Albert [Wed, 23 Sep 2015 20:42:33 +0000 (20:42 +0000)]
am
a41dd0a9: Merge "Don\'t apply --exclude-libs for the host."
* commit '
a41dd0a973ad9b890a4e2fe558ad6ed038bacdef':
Don't apply --exclude-libs for the host.
Dan Albert [Wed, 23 Sep 2015 20:34:47 +0000 (20:34 +0000)]
Merge "Don't apply --exclude-libs for the host."
Dan Albert [Wed, 23 Sep 2015 20:32:14 +0000 (13:32 -0700)]
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
Dan Albert [Wed, 23 Sep 2015 20:15:37 +0000 (20:15 +0000)]
am
c496b259: Merge "Default to hiding libgcc symbols in each object."
* commit '
c496b259b8dddf0eac71a50f5e258da4a353d6bb':
Default to hiding libgcc symbols in each object.
Dan Albert [Wed, 23 Sep 2015 20:08:09 +0000 (20:08 +0000)]
Merge "Default to hiding libgcc symbols in each object."
Bill Yi [Wed, 23 Sep 2015 19:38:58 +0000 (12:38 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Change-Id: Icc9bc2c03d47e1c02d3b535719862e55a9f9b7cd
Ying Wang [Tue, 22 Sep 2015 23:50:34 +0000 (23:50 +0000)]
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.
Dan Albert [Mon, 21 Sep 2015 23:36:41 +0000 (16:36 -0700)]
Default to hiding libgcc symbols in each object.
Bug: http://b/
24166967
Change-Id: I3dba264ae70a2e13b3edee7575139e86ef49be71
Ying Wang [Tue, 22 Sep 2015 23:44:41 +0000 (23:44 +0000)]
Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long."
Ying Wang [Tue, 22 Sep 2015 21:37:53 +0000 (14:37 -0700)]
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
Stephen Hines [Tue, 22 Sep 2015 22:06:34 +0000 (22:06 +0000)]
am
17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
* commit '
17a41e36dbe75b94bde05a1c511903ae2162aea8':
Add ld.mc as a requirement for core_tiny.mk as well.
Stephen Hines [Tue, 22 Sep 2015 22:00:34 +0000 (22:00 +0000)]
Merge "Add ld.mc as a requirement for core_tiny.mk as well."
Colin Cross [Tue, 22 Sep 2015 21:24:00 +0000 (14:24 -0700)]
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
Stephen Hines [Tue, 22 Sep 2015 19:49:39 +0000 (12:49 -0700)]
Add ld.mc as a requirement for core_tiny.mk as well.
Bug:
24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
Ying Wang [Tue, 22 Sep 2015 18:50:52 +0000 (18:50 +0000)]
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.