p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,566 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

24566 Commits

Author SHA1 Message Date
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 Willemsen aeaa0f5c58 Merge "Turn shared library multilib warnings into errors" 2015-09-24 20:59:20 +00: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 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 3f10705579 Merge "The pattern %tests is too broad." 2015-09-24 18:40:15 +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
Ying Wang 2f9f1fb32f resolved conflicts for 964f06b1 to stage-aosp-master 
Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419
 2015-09-23 19:31:44 -07: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 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
Dan Albert 782b98eaa1 Merge changes I3ca9ed36,Ibd7eec5c 
* changes:
  Revert "Default to hiding libgcc symbols in each object."
  Revert "Don't apply --exclude-libs for the host."
 2015-09-23 23:42:13 +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 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 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 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 a41dd0a973 Merge "Don't apply --exclude-libs for the host." 2015-09-23 20:34:47 +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 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 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 56dca5b540 Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long." 2015-09-22 23:44:41 +00: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
Stephen Hines 4a9e0c8cc5 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.
 2015-09-22 22:06:34 +00:00
Stephen Hines 17a41e36db Merge "Add ld.mc as a requirement for core_tiny.mk as well." 2015-09-22 22:00:34 +00: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
Stephen Hines 446ae75fb7 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
 2015-09-22 12:49:39 -07: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 9412efdc1b Merge "Don't build otatools.zip if we don't build the ota package." 2015-09-22 18:42:49 +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 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
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