Commit Graph

25834 Commits

Author SHA1 Message Date
Ying Wang fdfd0b0d81 Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources."
am: 81bbac6a0f

* commit '81bbac6a0fe76f2b007f6f0c2c3dc44f85fd4dd6':
  Don't delete META-INF in jack-java-to-dex when packing resources.
2015-11-24 22:01:54 +00:00
Ying Wang 81bbac6a0f Merge "Don't delete META-INF in jack-java-to-dex when packing resources." 2015-11-24 21:58:06 +00:00
Ying Wang 3be52e6692 Don't delete META-INF in jack-java-to-dex when packing resources.
LOCAL_DONT_DELETE_JAR_META_INF is meant for deleting resources carried
by static Java libraries, see comment in clear_vars.mk.
For a module's own resources, we should pick up whatever in
LOCAL_JAVA_RESOURCE_DIRS.
The same applies  when building .jack from a  prebult jar in
transform-jar-to-jack.

Bug: 25860887
Change-Id: I20c120e039342a1124362c5f8747eace94b03931
(cherry-pick from commit 996ae38ffd)
2015-11-24 13:57:10 -08:00
Chih-hung Hsieh 54ac6cd527 Merge "Move mips64 target to clang by default."
am: b0d9108795

* commit 'b0d9108795caea4b88be42d208c7a21e73de4c9f':
  Move mips64 target to clang by default.
2015-11-24 21:17:55 +00:00
Chih-hung Hsieh 917f4aea1d Merge "Move mips target to clang by default."
am: 80d6b0a9c6

* commit '80d6b0a9c607b15a70512996b5a56b0499e426b4':
  Move mips target to clang by default.
2015-11-24 21:17:47 +00:00
Chih-hung Hsieh b0d9108795 Merge "Move mips64 target to clang by default." 2015-11-24 21:13:38 +00:00
Chih-hung Hsieh 80d6b0a9c6 Merge "Move mips target to clang by default." 2015-11-24 21:13:17 +00:00
Alex Klyubin febce01c64 Merge "Clean up compiler warnings in signapk."
am: 0aaf7aa53c

* commit '0aaf7aa53ce5d1a8b5880303a21b83959bf1a432':
  Clean up compiler warnings in signapk.
2015-11-24 17:36:06 +00:00
Alex Klyubin 0aaf7aa53c Merge "Clean up compiler warnings in signapk." 2015-11-24 17:30:42 +00:00
Alex Klyubin c218d3eca3 Clean up compiler warnings in signapk.
Bug: 25794543
Change-Id: Ia7da4fbaed77af4020e5aa0b14fe5e1bd8521edb
2015-11-24 09:27:55 -08:00
Shinichiro Hamaji 22a2efde22 Merge "Prevent findleaves.py from traversing copies of "
am: 84639d127b

* commit '84639d127b50734ef670232bfa43a6fb9f3f0576':
  Prevent findleaves.py from traversing copies of $(OUT_DIR)
2015-11-24 04:57:26 +00:00
Shinichiro Hamaji 84639d127b Merge "Prevent findleaves.py from traversing copies of $(OUT_DIR)" 2015-11-24 04:54:02 +00:00
Chih-Hung Hsieh 4dcd769f2c Move mips64 target to clang by default.
Bug: 23163853
Change-Id: Ia3d449f908b09ce95b3de246c8c699d171dcbaa3
2015-11-20 13:35:44 -08:00
Chih-Hung Hsieh 990407e0a5 Move mips target to clang by default.
Bug: 23163853
Change-Id: I408ffd90ff2ff075e03962fffd1681fccf0319d3
2015-11-20 13:32:22 -08:00
Neil Fuller 2fc3bef75a Merge "Use sensible default locations for Java"
am: 8f354bc8c2

* commit '8f354bc8c2d4c27d93c7e13a853e0c9088d6ba94':
  Use sensible default locations for Java
2015-11-20 10:20:13 +00:00
Neil Fuller 8f354bc8c2 Merge "Use sensible default locations for Java" 2015-11-20 10:16:17 +00:00
Tao Bao 733ba8f0e4 Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
am: 4ed5735a68

* commit '4ed5735a68090e9eec240693ff6b97ea57576151':
  releasetools: Fix the bug with TARGET_NO_RECOVERY.
2015-11-20 04:50:31 +00:00
Tao Bao 4ed5735a68 Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." 2015-11-20 04:47:42 +00:00
Ying Wang 59ab005dde Merge "Increase droiddoc -J-Xmx to 1600MB."
am: 01f49a3d5e

* commit '01f49a3d5e5d8f4fdd83d1b74a230f8160aabe08':
  Increase droiddoc -J-Xmx to 1600MB.
2015-11-20 02:38:00 +00:00
Ying Wang 01f49a3d5e Merge "Increase droiddoc -J-Xmx to 1600MB." 2015-11-20 02:33:11 +00:00
Ying Wang 02bcb27b4a Increase droiddoc -J-Xmx to 1600MB.
As we occasionally see  java.lang.OutOfMemoryError when running
doc-comment-check-docs.

Bug: 25787786
Change-Id: I6c505c96ec36d09d28d400e03027b169870c49bb
2015-11-19 18:31:01 -08:00
Tao Bao 48550cceb0 releasetools: Fix the bug with TARGET_NO_RECOVERY.
The packaging script is broken when we set TARGET_NO_RECOVERY and
SYSTEM_ROOT_IMAGE both. With TARGET_NO_RECOVERY set, we don't have
RECOVERY/RAMDISK/etc/recovery.fstab. It thus fails the assertion in
common.LoadRecoveryFSTab() that "/" must exist in fstab when enabling
SYSTEM_ROOT_IMAGE.

Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
2015-11-19 17:14:21 -08:00
Christopher Wiley dbc3d09ca6 Merge "Fix race in C++ AIDL file generation"
am: b2055df782

* commit 'b2055df782eb5276128ef14ac4724d32f94e1aec':
  Fix race in C++ AIDL file generation
2015-11-19 22:07:06 +00:00
Colin Cross d924c14097 Merge "Switch to using kati env script"
am: 7926e42209

* commit '7926e42209b41766369e49b2093e6334564f93d4':
  Switch to using kati env script
2015-11-19 22:06:52 +00:00
Christopher Wiley b2055df782 Merge "Fix race in C++ AIDL file generation" 2015-11-19 22:01:27 +00:00
Christopher Wiley 2d91c61ef0 Fix race in C++ AIDL file generation
The export_includes file for a library needs to express a dependency on
all generated exported headers.  For aidl generated headers, express a
dependency on the .cpp file instead, since the generator promises to
generate this file last.  Unfortunately, the C++ headers generated from
a .aidl file depend on the contents of the file.

Change-Id: I9402b364e4538b502c0958ac8c7bd72cb0add724
2015-11-19 13:52:15 -08:00
Colin Cross 7926e42209 Merge "Switch to using kati env script" 2015-11-19 21:11:01 +00:00
Christopher Wiley a626a5f6d9 Merge "Export generated AIDL headers"
am: 0c595d4730

* commit '0c595d47304e6c00a493600b4a46f655cd148db9':
  Export generated AIDL headers
2015-11-19 19:24:42 +00:00
Christopher Wiley 0c595d4730 Merge "Export generated AIDL headers" 2015-11-19 19:17:47 +00:00
Christopher Wiley c7e936f530 Export generated AIDL headers
It is common for developers to generate/compile AIDL in a static
library, then link that library into an executable.  When doing this,
developers need to export the generated headers.

Bug: 25779424
Test: a refactoring of the aidl Android.mk shows this works

Change-Id: I4f7d471a601d2a683cb5a9da5e02e3fab576c26a
2015-11-19 11:04:18 -08:00
Neil Fuller 91e012cd99 Use sensible default locations for Java
Use sensible default locations for Java based on
the EXPERIMENTAL_USE_JAVA8 flag.

Bug: 25786468
Change-Id: I7ec035b5329785efc41b3f971d5e3ae202293576
2015-11-19 16:41:36 +00:00
Stephen Hines 4b191b40b7 Merge "Rename AArch64 ASan target runtime library to match upstream convention."
am: af9e29d040

* commit 'af9e29d040dc20aeb4cceb545d864d41ecf0bca5':
  Rename AArch64 ASan target runtime library to match upstream convention.
2015-11-19 16:20:00 +00:00
Stephen Hines af9e29d040 Merge "Rename AArch64 ASan target runtime library to match upstream convention." 2015-11-19 16:14:08 +00:00
Shinichiro Hamaji 6a378a3a7a Prevent findleaves.py from traversing copies of $(OUT_DIR)
by putting blank Android.mk and CleanSpec.mk in $(OUT_DIR).

Bug: 25732342
Change-Id: I3fcc4efddb9ee5ce309502e978f0589335af8371
2015-11-19 18:31:29 +09:00
Dan Albert e3b4114410 Merge "Really allow overriding the LLVM prebuilts path."
am: ec18c0fdfe

* commit 'ec18c0fdfe0475cb4eff2458cf1f825d37fbc2b5':
  Really allow overriding the LLVM prebuilts path.
2015-11-19 06:33:50 +00:00
Stephen Hines bf45029dc4 Rename AArch64 ASan target runtime library to match upstream convention.
Rename from
 libclang_rt.asan-arm64-android.so
to
 libclang_rt.asan-aarch64-android.so

Change-Id: I6d73f458f437440c1de5bc72d2188d392c80cb98
2015-11-18 22:13:16 -08:00
Dan Albert ec18c0fdfe Merge "Really allow overriding the LLVM prebuilts path." 2015-11-19 06:04:30 +00:00
Dan Albert 2d6d5c6e53 Really allow overriding the LLVM prebuilts path.
Not sure why my previous testing was working without this, but kati is
a bit pickier about ?= vs :=.

Change-Id: I80243a3c93dec7fd9b8e6f92e2c6cc956706ace0
2015-11-18 18:01:31 -08:00
Colin Cross b35469cb90 Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts"
am: 153af5a27e

* commit '153af5a27e48627c24bda68495d1a972c744aa00':
  Support LOCAL_ACP_UNAVAILABLE for prebuilts
2015-11-17 21:36:45 +00:00
Colin Cross 153af5a27e Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts" 2015-11-17 21:25:44 +00:00
Colin Cross ea20915b30 Switch to using kati env script
Kati generates a shell script to run ninja, but that makes it difficult
to customize the ninja command line.  Switch to sourcing the new env
script and then starting ninja manually.

Change-Id: I7139290a463018ddf5e05b4d61a0d2f18b1a2247
2015-11-17 12:10:13 -08:00
Tao Bao 2c1a4b9e88 Merge "releasetools: Pack updatable images into IMAGES/ for A/B update."
am: 128466cea5

* commit '128466cea5358eadbde19f52f16eef03f2685446':
  releasetools: Pack updatable images into IMAGES/ for A/B update.
2015-11-17 05:37:01 +00:00
Tao Bao 128466cea5 Merge "releasetools: Pack updatable images into IMAGES/ for A/B update." 2015-11-17 05:32:56 +00:00
Ying Wang 10021ac19d Merge "Remove unnecessary inheritance layer between aliases."
am: 2f05af74bc

* commit '2f05af74bce1fce1adc53090f46d38888c8232c4':
  Remove unnecessary inheritance layer between aliases.
2015-11-17 02:50:36 +00:00
Ying Wang 2f05af74bc Merge "Remove unnecessary inheritance layer between aliases." 2015-11-17 02:45:38 +00:00
Colin Cross d6f389299c Support LOCAL_ACP_UNAVAILABLE for prebuilts
Files built by soong will be installed using BUILD_PREBUILT, and may
include prerequesites of the acp binary.  Allow specifying
LOCAL_ACP_UNAVAILABLE:=true on prebuilts.

Change-Id: Iccfe61092f90b61f397a45f5334b0c1c0f439b32
2015-11-16 17:46:10 -08:00
Ying Wang cc2001fb44 Remove unnecessary inheritance layer between aliases.
The extra inheritance layer may cause multiple
PRODUCT_DEVICE/PRODUCT_BRAND values for a product if it doesn't
explicitly override them, eg. gms.
The full_* are deprecated product names. We keep them just for backward
compatibility, for some tools may still use the full_* product names.

Bug: 25611987
Change-Id: I7ecebd422754c3ceb16507b8d9ced65d533fe7c3
2015-11-16 17:21:42 -08:00
Tao Bao a0421cd1bd releasetools: Pack updatable images into IMAGES/ for A/B update.
Vendor-specific images (radio, bootloader and etc) used to stay in
RADIO/ in target_files zip. A/B updater expects them to be available
under IMAGES/. Make a copy for such images when calling
add_img_to_target_files.py.

We cannot move them directly from RADIO/ to IMAGES/, because we will
delete everything under IMAGES/ when signing for release.

Bug: 25674625
Change-Id: I977c879d0ff7e45c83b3f5c63844a5b135caa383
2015-11-16 16:42:43 -08:00
Dan Albert c00e0b841a Merge "Allow overriding the LLVM prebuilts path."
am: 9119f14943

* commit '9119f14943b3d90863660fec58b4967c9ba2ccaa':
  Allow overriding the LLVM prebuilts path.
2015-11-16 18:33:08 +00:00
Dan Albert 9119f14943 Merge "Allow overriding the LLVM prebuilts path." 2015-11-16 18:28:24 +00:00