OSDN Git Service
Ying Wang [Wed, 2 Dec 2015 17:53:17 +0000 (17:53 +0000)]
Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER"
am:
88ca8aff3e
* commit '
88ca8aff3e4c6f776444ca8267b044b314f6aa0f':
make USER limited to 6 characters when generating BF_BUILD_NUMBER
Ying Wang [Wed, 2 Dec 2015 17:48:21 +0000 (17:48 +0000)]
Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER"
wei qiao [Tue, 1 Dec 2015 06:20:55 +0000 (14:20 +0800)]
make USER limited to 6 characters when generating BF_BUILD_NUMBER
the value of USER is dependent from the compilation environment,so
when compiling one same device project, the BUILD_FINGERPRINT may
exceed 91 characters because ${USER} is long, but with short ${USER}
the compilation can pass.
Signed-off-by: wei qiao <qiaowei224@gmail.com>
Change-Id: Ia0f7dfa9cf7d605f1f2603f70dd0e6877482eb8a
Tao Bao [Tue, 1 Dec 2015 02:28:19 +0000 (02:28 +0000)]
Merge "Stop packaging obsolete OTA tools."
am:
b98fa19703
* commit '
b98fa19703ed0c7608f926007b1df257127ea777':
Stop packaging obsolete OTA tools.
Tao Bao [Tue, 1 Dec 2015 02:25:02 +0000 (02:25 +0000)]
Merge "Stop packaging obsolete OTA tools."
Colin Cross [Tue, 1 Dec 2015 01:45:58 +0000 (01:45 +0000)]
Merge "Make export_includes a restat rule"
am:
615d66e2c2
* commit '
615d66e2c21603552dc952db9493f43bbcc7f2b1':
Make export_includes a restat rule
Colin Cross [Tue, 1 Dec 2015 01:42:26 +0000 (01:42 +0000)]
Merge "Make export_includes a restat rule"
Colin Cross [Tue, 1 Dec 2015 01:33:26 +0000 (17:33 -0800)]
Make export_includes a restat rule
There is currently an intentional incremental rebuild issue with
import_includes. export_includes might get updated with an identical
version, but we don't want to force everything downstream of it to
rebuild.
When BUILDING_WITH_NINJA==true, only update export_includes if it
changes, and use .KATI_RESTAT to only run downstream rules if it
changes. import_includes will only be updated if one of the
export_includes files is updated, so object files can have a normal
dependency on import_includes instead of an order-only dependency.
All downstream object files will now be recompiled if their imported
include paths change.
Bug:
25910568
Change-Id: I626f3b24ac02ac1309049cf1ce66cfe8ec816513
Colin Cross [Tue, 1 Dec 2015 00:03:27 +0000 (00:03 +0000)]
Merge changes I1de10391,I4399ca26,Iec3b2b0b
am:
bff3c9b4c1
* commit '
bff3c9b4c10dcb3ce3820d3a5e144e3df20313dc':
Use libstdc++ for ijar
Build ijar for apps build
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Colin Cross [Tue, 1 Dec 2015 00:00:36 +0000 (00:00 +0000)]
Merge changes I1de10391,I4399ca26,Iec3b2b0b
* changes:
Use libstdc++ for ijar
Build ijar for apps build
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Tao Bao [Mon, 30 Nov 2015 20:22:24 +0000 (12:22 -0800)]
Stop packaging obsolete OTA tools.
applypatch, applypatch_static and sqlite3 are no longer needed.
Bug:
24621915
Change-Id: I6de5bc45bc8434b9c387e1d3d1b6c347c23a5290
Tao Bao [Mon, 30 Nov 2015 20:15:39 +0000 (20:15 +0000)]
Merge "releasetools: Allow logging the diff for incrementals."
am:
6d6e0481fa
* commit '
6d6e0481fa86cb552e1b386e5449fe1fde2325cf':
releasetools: Allow logging the diff for incrementals.
Tao Bao [Mon, 30 Nov 2015 20:09:39 +0000 (20:09 +0000)]
Merge "releasetools: Allow logging the diff for incrementals."
Tao Bao [Mon, 30 Nov 2015 17:40:20 +0000 (09:40 -0800)]
releasetools: Allow logging the diff for incrementals.
Add an option "--log_diff <filename>" to ota_from_target_files.py
script. When enabled, it logs the differences between the source
and target builds into <filename> when generating incremental OTAs.
Also move target_files_diff.py into releasetools/ so that it can be
packed into otatools.zip.
Bug:
25372309
Change-Id: Ifd4ed0f2f12ef040ee377621ec8c35a873cec34f
Colin Cross [Thu, 26 Nov 2015 22:08:34 +0000 (14:08 -0800)]
Use libstdc++ for ijar
For some reason ijar won't build against libc++ for TARGET_BUILD_APPS
builds, but does build with libstdc++.
(cherry picked from commit
718bab6aecfe7e23a6afa1361da64c8e0c832705)
Bug:
25904002
Change-Id: I1de103918faa5bb574af6f12cc954e7fed44dc62
Shinichiro Hamaji [Thu, 26 Nov 2015 08:24:40 +0000 (17:24 +0900)]
Build ijar for apps build
This fixes git_master-linux-apps build.
(cherry picked from commit
90847057446374f818b49a742c567f82db02438e)
Change-Id: I4399ca2662e08c9b3cc2ad5a317e84d91b728115
Shinichiro Hamaji [Mon, 9 Nov 2015 07:47:42 +0000 (16:47 +0900)]
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
The same optimization was done for binaries in
https://android-review.googlesource.com/#/c/175250/
To create a TOC file from .jar files, this change introduces
ijar, which is designed for this purpose. Only #include lines
were modified from the original version.
https://github.com/bazelbuild/bazel/tree/master/third_party/ijar
Performance:
$ m && touch
frameworks/base/core/java/com/google/android/util/Procedure.java && time
m
Before: 4m30s (1580 targets)
After: 3m57s (772 targets)
Unfortunately, the improvement is small yet, but local
experiments showed we can cut ~2 more minutes if the similar
optimization is done for .dex files.
(cherry picked from commit
c1f5d9c203324b9435414e789c02394ca99c98f7)
Bug:
24597504
Change-Id: Iec3b2b0b0e674bee5d80cce3c300dc8fad6e7c13
Shinichiro Hamaji [Fri, 27 Nov 2015 04:02:09 +0000 (04:02 +0000)]
Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files""
am:
2ff3ad9045
* commit '
2ff3ad90455e868a1805d065f0aa2b8babbc6660':
Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
Shinichiro Hamaji [Fri, 27 Nov 2015 04:02:01 +0000 (04:02 +0000)]
Merge "Revert "Build ijar for apps build""
am:
d17c3a57f6
* commit '
d17c3a57f6f183b97cc557e10e221b4dc1acf47f':
Revert "Build ijar for apps build"
Shinichiro Hamaji [Fri, 27 Nov 2015 03:59:30 +0000 (03:59 +0000)]
Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files""
Shinichiro Hamaji [Fri, 27 Nov 2015 03:59:18 +0000 (03:59 +0000)]
Merge "Revert "Build ijar for apps build""
Shinichiro Hamaji [Fri, 27 Nov 2015 03:58:51 +0000 (03:58 +0000)]
Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
This reverts commit
c1f5d9c203324b9435414e789c02394ca99c98f7.
Change-Id: I7e9969a060e3f1380154da65e76134168aee15d8
Shinichiro Hamaji [Fri, 27 Nov 2015 03:57:17 +0000 (03:57 +0000)]
Revert "Build ijar for apps build"
This reverts commit
90847057446374f818b49a742c567f82db02438e.
Change-Id: I8a9958788c51dcec5028ef396cb67abd541ce31f
Colin Cross [Thu, 26 Nov 2015 22:23:02 +0000 (22:23 +0000)]
Merge "Revert "Use libstdc++ for ijar""
am:
41dca40376
* commit '
41dca403766d22373ba469d99ba1625d0930d02e':
Revert "Use libstdc++ for ijar"
Colin Cross [Thu, 26 Nov 2015 22:20:38 +0000 (22:20 +0000)]
Merge "Revert "Use libstdc++ for ijar""
Colin Cross [Thu, 26 Nov 2015 22:20:22 +0000 (22:20 +0000)]
Revert "Use libstdc++ for ijar"
This reverts commit
718bab6aecfe7e23a6afa1361da64c8e0c832705.
Change-Id: I9aa222fc2936d7d89ae0700eeef505c6b317d777
Colin Cross [Thu, 26 Nov 2015 22:12:38 +0000 (22:12 +0000)]
Merge "Use libstdc++ for ijar"
am:
c97b5272d7
* commit '
c97b5272d715ab9f4ff52748bd2f403235f94426':
Use libstdc++ for ijar
Colin Cross [Thu, 26 Nov 2015 22:10:31 +0000 (22:10 +0000)]
Merge "Use libstdc++ for ijar"
Colin Cross [Thu, 26 Nov 2015 22:08:34 +0000 (14:08 -0800)]
Use libstdc++ for ijar
For some reason ijar won't build against libc++ for TARGET_BUILD_APPS
builds, but does build with libstdc++.
Change-Id: I8e900b0f764f0bb8f827705cb9173f07e4f33862
Colin Cross [Thu, 26 Nov 2015 17:36:29 +0000 (17:36 +0000)]
Merge "Build ijar for apps build"
am:
ec4db56e58
* commit '
ec4db56e5802171bc2d0237f496e97ec093f0be0':
Build ijar for apps build
Colin Cross [Thu, 26 Nov 2015 17:34:50 +0000 (17:34 +0000)]
Merge "Build ijar for apps build"
Paul Duffin [Thu, 26 Nov 2015 11:43:02 +0000 (11:43 +0000)]
Merge "Fix generated-sources-dir-for for COMMON"
am:
623799d3e0
* commit '
623799d3e0aab49b00552fb7862f2528b845bd51':
Fix generated-sources-dir-for for COMMON
Paul Duffin [Thu, 26 Nov 2015 11:39:30 +0000 (11:39 +0000)]
Merge "Fix generated-sources-dir-for for COMMON"
Shinichiro Hamaji [Thu, 26 Nov 2015 08:24:40 +0000 (17:24 +0900)]
Build ijar for apps build
This fixes git_master-linux-apps build.
Change-Id: I1a77b2495d98d89f570cb165d7f25f617c9af9aa
Shinichiro Hamaji [Thu, 26 Nov 2015 05:30:54 +0000 (05:30 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
am:
c9a1b27845
* commit '
c9a1b278458eddd3065c0e9fc06e12b2cb1c38cb':
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Shinichiro Hamaji [Thu, 26 Nov 2015 05:25:58 +0000 (05:25 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
Paul Duffin [Wed, 25 Nov 2015 13:14:23 +0000 (13:14 +0000)]
Fix generated-sources-dir-for for COMMON
When the 4th argument specified is non-empty then it attempts to
use either HOST_OUT_GEN_COMMON or TARGET_OUT_GEN_COMMON
depending on whether the 3rd argument is non-empty or not
respectively. Unfortunately, those two variables do not exist,
the correct names for those variables is HOST_OUT_COMMON_GEN and
TARGET_OUT_COMMON_GET.
Change-Id: I66edb02824c06e0f504ebe04ff80ddbd77a16c95
Tao Bao [Wed, 25 Nov 2015 00:03:01 +0000 (00:03 +0000)]
Merge "target_files_diff: Allow writing outputs to file."
am:
7b5eddd52b
* commit '
7b5eddd52bfb70485488458a115a33f1af92759a':
target_files_diff: Allow writing outputs to file.
Tao Bao [Tue, 24 Nov 2015 23:57:44 +0000 (23:57 +0000)]
Merge "target_files_diff: Allow writing outputs to file."
Tao Bao [Tue, 24 Nov 2015 23:17:17 +0000 (15:17 -0800)]
target_files_diff: Allow writing outputs to file.
Also clean up some pylint warnings.
Bug:
25372309
Change-Id: I226bfd72cb1310ba77352f8d367803e815e1cfa3
Ying Wang [Tue, 24 Nov 2015 22:16:45 +0000 (22:16 +0000)]
Ying Wang [Tue, 24 Nov 2015 22:09:49 +0000 (22:09 +0000)]
Merge "Fix typo."
Ying Wang [Tue, 24 Nov 2015 22:09:11 +0000 (14:09 -0800)]
Fix typo.
Change-Id: I299076791c620968fa7a5c420b5ca21ea4d30b51
Ying Wang [Tue, 24 Nov 2015 22:01:54 +0000 (22:01 +0000)]
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.
Ying Wang [Tue, 24 Nov 2015 21:58:06 +0000 (21:58 +0000)]
Merge "Don't delete META-INF in jack-java-to-dex when packing resources."
Ying Wang [Tue, 24 Nov 2015 19:44:20 +0000 (11:44 -0800)]
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
996ae38ffd552be2a8420de6651c1982e0723e02)
Chih-hung Hsieh [Tue, 24 Nov 2015 21:17:55 +0000 (21:17 +0000)]
Merge "Move mips64 target to clang by default."
am:
b0d9108795
* commit '
b0d9108795caea4b88be42d208c7a21e73de4c9f':
Move mips64 target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:17:47 +0000 (21:17 +0000)]
Merge "Move mips target to clang by default."
am:
80d6b0a9c6
* commit '
80d6b0a9c607b15a70512996b5a56b0499e426b4':
Move mips target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:13:38 +0000 (21:13 +0000)]
Merge "Move mips64 target to clang by default."
Chih-hung Hsieh [Tue, 24 Nov 2015 21:13:17 +0000 (21:13 +0000)]
Merge "Move mips target to clang by default."
Alex Klyubin [Tue, 24 Nov 2015 17:36:06 +0000 (17:36 +0000)]
Merge "Clean up compiler warnings in signapk."
am:
0aaf7aa53c
* commit '
0aaf7aa53ce5d1a8b5880303a21b83959bf1a432':
Clean up compiler warnings in signapk.
Alex Klyubin [Tue, 24 Nov 2015 17:30:42 +0000 (17:30 +0000)]
Merge "Clean up compiler warnings in signapk."
Alex Klyubin [Thu, 19 Nov 2015 21:09:57 +0000 (13:09 -0800)]
Clean up compiler warnings in signapk.
Bug:
25794543
Change-Id: Ia7da4fbaed77af4020e5aa0b14fe5e1bd8521edb
Shinichiro Hamaji [Tue, 24 Nov 2015 04:57:26 +0000 (04:57 +0000)]
Merge "Prevent findleaves.py from traversing copies of "
am:
84639d127b
* commit '
84639d127b50734ef670232bfa43a6fb9f3f0576':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
Shinichiro Hamaji [Tue, 24 Nov 2015 04:54:02 +0000 (04:54 +0000)]
Merge "Prevent findleaves.py from traversing copies of $(OUT_DIR)"
Chih-Hung Hsieh [Fri, 20 Nov 2015 21:34:36 +0000 (13:34 -0800)]
Move mips64 target to clang by default.
Bug:
23163853
Change-Id: Ia3d449f908b09ce95b3de246c8c699d171dcbaa3
Chih-Hung Hsieh [Fri, 20 Nov 2015 21:32:22 +0000 (13:32 -0800)]
Move mips target to clang by default.
Bug:
23163853
Change-Id: I408ffd90ff2ff075e03962fffd1681fccf0319d3
Neil Fuller [Fri, 20 Nov 2015 10:20:13 +0000 (10:20 +0000)]
Merge "Use sensible default locations for Java"
am:
8f354bc8c2
* commit '
8f354bc8c2d4c27d93c7e13a853e0c9088d6ba94':
Use sensible default locations for Java
Neil Fuller [Fri, 20 Nov 2015 10:16:17 +0000 (10:16 +0000)]
Merge "Use sensible default locations for Java"
Tao Bao [Fri, 20 Nov 2015 04:50:31 +0000 (04:50 +0000)]
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
am:
4ed5735a68
* commit '
4ed5735a68090e9eec240693ff6b97ea57576151':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
Tao Bao [Fri, 20 Nov 2015 04:47:42 +0000 (04:47 +0000)]
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
Ying Wang [Fri, 20 Nov 2015 02:38:00 +0000 (02:38 +0000)]
Merge "Increase droiddoc -J-Xmx to 1600MB."
am:
01f49a3d5e
* commit '
01f49a3d5e5d8f4fdd83d1b74a230f8160aabe08':
Increase droiddoc -J-Xmx to 1600MB.
Ying Wang [Fri, 20 Nov 2015 02:33:11 +0000 (02:33 +0000)]
Merge "Increase droiddoc -J-Xmx to 1600MB."
Ying Wang [Fri, 20 Nov 2015 02:31:01 +0000 (18:31 -0800)]
Increase droiddoc -J-Xmx to 1600MB.
As we occasionally see java.lang.OutOfMemoryError when running
doc-comment-check-docs.
Bug:
25787786
Change-Id: I6c505c96ec36d09d28d400e03027b169870c49bb
Tao Bao [Fri, 20 Nov 2015 01:05:46 +0000 (17:05 -0800)]
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
Christopher Wiley [Thu, 19 Nov 2015 22:07:06 +0000 (22:07 +0000)]
Merge "Fix race in C++ AIDL file generation"
am:
b2055df782
* commit '
b2055df782eb5276128ef14ac4724d32f94e1aec':
Fix race in C++ AIDL file generation
Colin Cross [Thu, 19 Nov 2015 22:06:52 +0000 (22:06 +0000)]
Merge "Switch to using kati env script"
am:
7926e42209
* commit '
7926e42209b41766369e49b2093e6334564f93d4':
Switch to using kati env script
Christopher Wiley [Thu, 19 Nov 2015 22:01:27 +0000 (22:01 +0000)]
Merge "Fix race in C++ AIDL file generation"
Christopher Wiley [Thu, 19 Nov 2015 21:52:15 +0000 (13:52 -0800)]
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
Colin Cross [Thu, 19 Nov 2015 21:11:01 +0000 (21:11 +0000)]
Merge "Switch to using kati env script"
Christopher Wiley [Thu, 19 Nov 2015 19:24:42 +0000 (19:24 +0000)]
Merge "Export generated AIDL headers"
am:
0c595d4730
* commit '
0c595d47304e6c00a493600b4a46f655cd148db9':
Export generated AIDL headers
Christopher Wiley [Thu, 19 Nov 2015 19:17:47 +0000 (19:17 +0000)]
Merge "Export generated AIDL headers"
Christopher Wiley [Thu, 19 Nov 2015 15:06:01 +0000 (07:06 -0800)]
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
Neil Fuller [Thu, 19 Nov 2015 15:51:47 +0000 (15:51 +0000)]
Use sensible default locations for Java
Use sensible default locations for Java based on
the EXPERIMENTAL_USE_JAVA8 flag.
Bug:
25786468
Change-Id: I7ec035b5329785efc41b3f971d5e3ae202293576
Stephen Hines [Thu, 19 Nov 2015 16:20:00 +0000 (16:20 +0000)]
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.
Stephen Hines [Thu, 19 Nov 2015 16:14:08 +0000 (16:14 +0000)]
Merge "Rename AArch64 ASan target runtime library to match upstream convention."
Shinichiro Hamaji [Thu, 19 Nov 2015 09:30:21 +0000 (18:30 +0900)]
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
Shinichiro Hamaji [Mon, 9 Nov 2015 07:47:42 +0000 (16:47 +0900)]
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
The same optimization was done for binaries in
https://android-review.googlesource.com/#/c/175250/
To create a TOC file from .jar files, this change introduces
ijar, which is designed for this purpose. Only #include lines
were modified from the original version.
https://github.com/bazelbuild/bazel/tree/master/third_party/ijar
Performance:
$ m && touch
frameworks/base/core/java/com/google/android/util/Procedure.java && time
m
Before: 4m30s (1580 targets)
After: 3m57s (772 targets)
Unfortunately, the improvement is small yet, but local
experiments showed we can cut ~2 more minutes if the similar
optimization is done for .dex files.
Bug:
24597504
Change-Id: Id54953aea25e497c8ebbe783b03f13b488577c6a
Dan Albert [Thu, 19 Nov 2015 06:33:50 +0000 (06:33 +0000)]
Merge "Really allow overriding the LLVM prebuilts path."
am:
ec18c0fdfe
* commit '
ec18c0fdfe0475cb4eff2458cf1f825d37fbc2b5':
Really allow overriding the LLVM prebuilts path.
Stephen Hines [Thu, 19 Nov 2015 06:13:16 +0000 (22:13 -0800)]
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
Dan Albert [Thu, 19 Nov 2015 06:04:30 +0000 (06:04 +0000)]
Merge "Really allow overriding the LLVM prebuilts path."
Dan Albert [Thu, 19 Nov 2015 02:00:40 +0000 (18:00 -0800)]
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
Colin Cross [Tue, 17 Nov 2015 21:36:45 +0000 (21:36 +0000)]
Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts"
am:
153af5a27e
* commit '
153af5a27e48627c24bda68495d1a972c744aa00':
Support LOCAL_ACP_UNAVAILABLE for prebuilts
Colin Cross [Tue, 17 Nov 2015 21:25:44 +0000 (21:25 +0000)]
Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts"
Colin Cross [Mon, 9 Nov 2015 22:21:12 +0000 (14:21 -0800)]
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
Tao Bao [Tue, 17 Nov 2015 05:37:01 +0000 (05:37 +0000)]
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.
Tao Bao [Tue, 17 Nov 2015 05:32:56 +0000 (05:32 +0000)]
Merge "releasetools: Pack updatable images into IMAGES/ for A/B update."
Ying Wang [Tue, 17 Nov 2015 02:50:36 +0000 (02:50 +0000)]
Merge "Remove unnecessary inheritance layer between aliases."
am:
2f05af74bc
* commit '
2f05af74bce1fce1adc53090f46d38888c8232c4':
Remove unnecessary inheritance layer between aliases.
Ying Wang [Tue, 17 Nov 2015 02:45:38 +0000 (02:45 +0000)]
Merge "Remove unnecessary inheritance layer between aliases."
Colin Cross [Tue, 17 Nov 2015 01:43:11 +0000 (17:43 -0800)]
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
Ying Wang [Tue, 17 Nov 2015 01:16:47 +0000 (17:16 -0800)]
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
Tao Bao [Tue, 17 Nov 2015 00:32:27 +0000 (16:32 -0800)]
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
Dan Albert [Mon, 16 Nov 2015 18:33:08 +0000 (18:33 +0000)]
Merge "Allow overriding the LLVM prebuilts path."
am:
9119f14943
* commit '
9119f14943b3d90863660fec58b4967c9ba2ccaa':
Allow overriding the LLVM prebuilts path.
Dan Albert [Mon, 16 Nov 2015 18:28:24 +0000 (18:28 +0000)]
Merge "Allow overriding the LLVM prebuilts path."
Dan Albert [Sat, 14 Nov 2015 07:06:07 +0000 (23:06 -0800)]
Allow overriding the LLVM prebuilts path.
The automated build will need to do a two stage build, and we want to
do that without altering the source directory. Building with
`make LLVM_PREBUILTS_BASE=/path/to/prebuilts` will build using an
arbitrary toolchain instead of the installed one.
Bug: http://b/
17441393
Change-Id: I4ff5c5224fbb8ebeb3a752907d6c4cd0a925aa1e
Sen Jiang [Fri, 13 Nov 2015 19:17:06 +0000 (19:17 +0000)]
Merge "Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt."
am:
99d5f361b4
* commit '
99d5f361b4d587eed1b197f501bff64223dda3b9':
Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt.
Sen Jiang [Fri, 13 Nov 2015 19:14:00 +0000 (19:14 +0000)]
Merge "Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt."
Sen Jiang [Thu, 12 Nov 2015 21:53:25 +0000 (13:53 -0800)]
Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt.
The config file will be passed to delta_generator to add the postinstall
field in the update payload.
Bug:
24537566
Change-Id: I06b8d9d0b2c37f9a3e7a844ac4d9e2eead8cd4d2
TEST: make dist
Shinichiro Hamaji [Fri, 13 Nov 2015 07:30:53 +0000 (07:30 +0000)]
Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build"
am:
a50961ae95
* commit '
a50961ae9517cdaab83294e537f35922717e17f9':
Use GOMA_HERMETIC=error for USE_GOMA=true build
Shinichiro Hamaji [Fri, 13 Nov 2015 07:26:39 +0000 (07:26 +0000)]
Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build"