OSDN Git Service
Andreas Gampe [Tue, 20 Oct 2015 23:54:53 +0000 (23:54 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am:
6c45f4493e
am:
3c131856ee
* commit '
3c131856ee9e08c69830675cfc6c3597f783816a':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
Andreas Gampe [Tue, 20 Oct 2015 23:50:59 +0000 (23:50 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
am:
6c45f4493e
* commit '
6c45f4493e125f4632ee0d0ed95d0198018cbb80':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
Andreas Gampe [Tue, 20 Oct 2015 23:37:36 +0000 (23:37 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
Roland Levillain [Tue, 20 Oct 2015 21:54:03 +0000 (21:54 +0000)]
Merge "Typos in envsetup.sh." am:
8503cfb49c
am:
fef5ba8ec7
* commit '
fef5ba8ec719a9fdd5f8b3d91d61d01a353e1ede':
Typos in envsetup.sh.
Roland Levillain [Tue, 20 Oct 2015 21:44:10 +0000 (21:44 +0000)]
Merge "Typos in envsetup.sh."
am:
8503cfb49c
* commit '
8503cfb49c797bffa2568cffaab483071230fef0':
Typos in envsetup.sh.
Roland Levillain [Tue, 20 Oct 2015 21:30:10 +0000 (21:30 +0000)]
Merge "Typos in envsetup.sh."
Dan Willemsen [Tue, 20 Oct 2015 20:58:31 +0000 (20:58 +0000)]
Merge "Stop encoding absolute paths in symbols" am:
9f576acde6
am:
b93e8250d7
* commit '
b93e8250d7ffbf0760bda670dbcd2ad25b504e90':
Stop encoding absolute paths in symbols
Dan Willemsen [Tue, 20 Oct 2015 20:52:09 +0000 (20:52 +0000)]
Merge "Stop encoding absolute paths in symbols"
am:
9f576acde6
* commit '
9f576acde6c27149c9ca563f0a73e9f1c5e0e768':
Stop encoding absolute paths in symbols
Dan Willemsen [Tue, 20 Oct 2015 20:46:21 +0000 (20:46 +0000)]
Merge "Stop encoding absolute paths in symbols"
Chih-hung Hsieh [Tue, 20 Oct 2015 20:18:30 +0000 (20:18 +0000)]
Merge "Move x86 target to clang by default." am:
a993bfff36
am:
ebfadd8990
* commit '
ebfadd89905f4e703b81c024d9841fdd70595422':
Move x86 target to clang by default.
Chih-hung Hsieh [Tue, 20 Oct 2015 20:12:12 +0000 (20:12 +0000)]
Merge "Move x86 target to clang by default."
am:
a993bfff36
* commit '
a993bfff361b22902387fc66d734abe385ca3338':
Move x86 target to clang by default.
Chih-hung Hsieh [Tue, 20 Oct 2015 19:47:55 +0000 (19:47 +0000)]
Merge "Move x86 target to clang by default."
Chih-Hung Hsieh [Tue, 20 Oct 2015 19:16:57 +0000 (12:16 -0700)]
Move x86 target to clang by default.
Bug:
23163853
Change-Id: Ib5e9beddbeca8968d6e4365abeb44ae97cbe9981
Roland Levillain [Tue, 20 Oct 2015 11:48:19 +0000 (12:48 +0100)]
Typos in envsetup.sh.
Change-Id: I31cc811e1352b9c924bdf164561f334b032d6f5c
Andreas Gampe [Fri, 16 Oct 2015 03:43:29 +0000 (20:43 -0700)]
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
The secondary variant fallback was not set. The build system expects
the variants, so system properties were malformed for x86-64:
[dalvik.vm.isa.x86.variant]: [dalvik.vm.isa.x86.features=default]
Bug:
24989387
Change-Id: Idbf54f81494f2650ad56080305807fd6b7ed4161
Christopher Wiley [Mon, 19 Oct 2015 23:56:48 +0000 (23:56 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++" am:
ba39c5690a
am:
487cc7beaf
* commit '
487cc7beaff3e4fecd92504c1972d6d53079f84e':
Invoke the aidl-cpp compiler to generate C++
Christopher Wiley [Mon, 19 Oct 2015 23:49:58 +0000 (23:49 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++"
am:
ba39c5690a
* commit '
ba39c5690aae0bcd7102c0030a31b705ce1b92f1':
Invoke the aidl-cpp compiler to generate C++
Christopher Wiley [Mon, 19 Oct 2015 23:44:21 +0000 (23:44 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++"
Ying Wang [Mon, 19 Oct 2015 23:28:27 +0000 (23:28 +0000)]
Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am:
475054a16a
am:
3a6ad87039
* commit '
3a6ad87039910b7fc7bfb078fec8a66d66441d81':
envsetup: Show error when supplied dir isn't present with mmm
Ying Wang [Mon, 19 Oct 2015 23:21:46 +0000 (23:21 +0000)]
Merge "envsetup: Show error when supplied dir isn\'t present with mmm"
am:
475054a16a
* commit '
475054a16ad57b184fa476c093cf1ce8e9ec3e15':
envsetup: Show error when supplied dir isn't present with mmm
Christopher Wiley [Thu, 15 Oct 2015 00:27:24 +0000 (17:27 -0700)]
Invoke the aidl-cpp compiler to generate C++
Bug:
23599697
Test: test application compiles generated code
Change-Id: I35255517dd0b7ef7a82134be1c862093eaa3ce6b
Ying Wang [Mon, 19 Oct 2015 22:44:03 +0000 (22:44 +0000)]
Merge "envsetup: Show error when supplied dir isn't present with mmm"
Dan Willemsen [Mon, 19 Oct 2015 21:30:20 +0000 (21:30 +0000)]
am
3fc56a1f: am
77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
* commit '
3fc56a1fa18399f9dfaa2d9a7ae2c7aee852d574':
Add support for LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Mon, 19 Oct 2015 21:24:53 +0000 (14:24 -0700)]
am
77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
* commit '
7749304741070af8239e02f68d688fc45fd877d1':
Add support for LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Mon, 19 Oct 2015 21:21:40 +0000 (21:21 +0000)]
Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
Abhinav1997 [Sun, 18 Oct 2015 18:25:48 +0000 (20:25 +0200)]
envsetup: Show error when supplied dir isn't present with mmm
When a directory isn't present with mmm, don't show "No Android.mk present", rather show that the directory isn't present
Change-Id: I7259a60012c6f30c470daa60d5a5097d01ffc4c7
Signed-off-by: Abhinav1997 <abhinav.jhanwar.august2@gmail.com>
Sami Tolvanen [Mon, 19 Oct 2015 09:59:12 +0000 (09:59 +0000)]
am
58a748d3: am
87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '
58a748d37e0a6f9ec063b374d4f60354def26579':
Error correction: Append codes to verified partitions
Sami Tolvanen [Mon, 19 Oct 2015 09:55:51 +0000 (02:55 -0700)]
am
87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '
87f582611a5a5c23abf3237abe0e467e46111567':
Error correction: Append codes to verified partitions
Sami Tolvanen [Mon, 19 Oct 2015 09:49:18 +0000 (09:49 +0000)]
Merge "Error correction: Append codes to verified partitions"
Ying Wang [Sun, 18 Oct 2015 17:17:28 +0000 (17:17 +0000)]
am
cd9545a4: am
4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit '
cd9545a499a1124a52e4edf962c53b83f23ebae8':
If a console doesn't exist, read password from stdin.
Ying Wang [Sun, 18 Oct 2015 17:12:27 +0000 (10:12 -0700)]
am
4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit '
4f6f0f924eba9f80493861a9e7ff7f40f9924aa2':
If a console doesn't exist, read password from stdin.
Ying Wang [Sun, 18 Oct 2015 17:07:28 +0000 (17:07 +0000)]
Merge "If a console doesn't exist, read password from stdin."
Tao Bao [Sat, 17 Oct 2015 01:31:49 +0000 (01:31 +0000)]
am
512d7b87: am
1280fa01: am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
512d7b87dc04551633d603e1dd97e95d0dcc3565':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:27:16 +0000 (01:27 +0000)]
am
1280fa01: am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
1280fa01bd263eac1d31850fe47f8e0aa93cab82':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:23:02 +0000 (01:23 +0000)]
am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
09ee6daa7f4d9a526532e77b45aa88bbf1f0776d':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:19:15 +0000 (01:19 +0000)]
am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:15:39 +0000 (01:15 +0000)]
Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev
Colin Cross [Tue, 30 Jun 2015 19:21:59 +0000 (12:21 -0700)]
Add support for LOCAL_SRC_FILES_EXCLUDE
LOCAL_SRC_FILES_EXCLUDE will be used to filter files out of
LOCAL_SRC_FILES. A common usage will be to use
LOCAL_SRC_FILES_EXCLUDE_<arch> to remove a source file that will be
replaced with an arch-optimized version.
Change-Id: I75cc6114c47fb784bab65cae8f618c4f395f07bb
Tao Bao [Sat, 17 Oct 2015 00:21:47 +0000 (00:21 +0000)]
am
9cc6c37a: am
5631d5c6: am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
9cc6c37a54626a4d23599fa8d86ffe0bcabec55a':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:18:27 +0000 (00:18 +0000)]
am
5631d5c6: am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:13:36 +0000 (00:13 +0000)]
am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
46ae586ab26f5bf63baaac6c68942f1bfba4addc':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)]
am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
e09359abc0f8c29fbb16d35ab7375d80fde6f931':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Fri, 16 Oct 2015 22:50:39 +0000 (22:50 +0000)]
am
6ce8ae76: am
ac39bef4: Merge "common.py: Fix the build."
* commit '
6ce8ae761b8a238ce215638510230baed277235f':
common.py: Fix the build.
Tao Bao [Tue, 13 Oct 2015 23:37:12 +0000 (16:37 -0700)]
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Also includes the CL in commit
aac4ad56b6c60e271d807604b20f72084c58b426
that fixes a bug in commit
6f0b219ac551710c724e3f344023943178cdc217.
Bug:
24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit
6f0b219ac551710c724e3f344023943178cdc217)
Tao Bao [Fri, 16 Oct 2015 22:46:31 +0000 (15:46 -0700)]
am
ac39bef4: Merge "common.py: Fix the build."
* commit '
ac39bef43fb032bff75b8558f54107e733355265':
common.py: Fix the build.
Tao Bao [Fri, 16 Oct 2015 22:41:45 +0000 (22:41 +0000)]
Merge "common.py: Fix the build."
Tao Bao [Fri, 16 Oct 2015 22:26:34 +0000 (15:26 -0700)]
common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.
Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
Tao Bao [Fri, 16 Oct 2015 21:55:46 +0000 (21:55 +0000)]
am
63e63c2a: am
543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '
63e63c2a0754e726d6f810588a0314a79268f404':
Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Fri, 16 Oct 2015 21:49:40 +0000 (14:49 -0700)]
am
543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '
543b28d42f8fdebe011a906826251ab8df70a226':
Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
DO NOT MERGE releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit
7589e961a7b8b7d964704db87f83ed8811e97ac6)
Tao Bao [Fri, 16 Oct 2015 21:42:34 +0000 (21:42 +0000)]
Merge "Pass source's info_dict to vendor's releasetools.py."
Ying Wang [Fri, 16 Oct 2015 01:29:58 +0000 (01:29 +0000)]
am
19fcc054: am
19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '
19fcc054bd489799408691bbb933ff2d6cea7a4a':
Use direct dependency on the JNI so files.
Ying Wang [Fri, 16 Oct 2015 01:25:15 +0000 (01:25 +0000)]
am
19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '
19e4741df60643d4fdb876e77069bb63857a12b2':
Use direct dependency on the JNI so files.
Ying Wang [Fri, 16 Oct 2015 01:19:48 +0000 (01:19 +0000)]
Merge "Use direct dependency on the JNI so files."
Ying Wang [Thu, 15 Oct 2015 22:29:01 +0000 (15:29 -0700)]
Use direct dependency on the JNI so files.
With the order-only dependency if the jni so files is updated,
make won't rebuild the system.img, which has dependency only on the apk
file.
Bug:
24865400
Change-Id: I9d5bee82b8a712a2c24dabaa0cd4c50174ea219f
Dan Albert [Thu, 15 Oct 2015 18:53:55 +0000 (18:53 +0000)]
am
b56b2e9a: am
5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."
* commit '
b56b2e9aa0df332699b39f0e020518413eeddee8':
Use libgcov OR libclang_rt.profile, not both.
Dan Albert [Thu, 15 Oct 2015 18:48:42 +0000 (18:48 +0000)]
am
5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."
* commit '
5baea1436371dea7e14562b17431bcd2b6a55f7d':
Use libgcov OR libclang_rt.profile, not both.
Ying Wang [Thu, 15 Oct 2015 18:45:35 +0000 (18:45 +0000)]
am
5eb1f1fb: am
f1b066b5: Merge "Remove duplicate local_time.default"
* commit '
5eb1f1fbf1b62870a0c44088dd8046b7b87239dc':
Remove duplicate local_time.default
Ying Wang [Thu, 15 Oct 2015 18:39:45 +0000 (18:39 +0000)]
am
f1b066b5: Merge "Remove duplicate local_time.default"
* commit '
f1b066b5ce3ebec905cb38dbb48a77dc58d4c457':
Remove duplicate local_time.default
Dan Albert [Thu, 15 Oct 2015 18:39:42 +0000 (18:39 +0000)]
Merge "Use libgcov OR libclang_rt.profile, not both."
Ying Wang [Thu, 15 Oct 2015 18:35:26 +0000 (18:35 +0000)]
Merge "Remove duplicate local_time.default"
Steve Fung [Thu, 15 Oct 2015 18:27:46 +0000 (18:27 +0000)]
am
a6968d8f: am
2af58637: Merge "Add the Product ID to target_files.zip"
* commit '
a6968d8f1db449ce84ec7c99f7c4e571d1abb289':
Add the Product ID to target_files.zip
Steve Fung [Thu, 15 Oct 2015 18:19:52 +0000 (18:19 +0000)]
am
2af58637: Merge "Add the Product ID to target_files.zip"
* commit '
2af586376d2b99c75a5672c72a704f2031adc0fe':
Add the Product ID to target_files.zip
Steve Fung [Thu, 15 Oct 2015 18:13:41 +0000 (18:13 +0000)]
Merge "Add the Product ID to target_files.zip"
Nick Kralevich [Thu, 15 Oct 2015 09:50:56 +0000 (09:50 +0000)]
am
f14b0298: am
5c24a50e: Merge "generic_x86: delete system_server execmem"
* commit '
f14b0298f645b03a3f63587a678350741cca7e3d':
generic_x86: delete system_server execmem
Nick Kralevich [Thu, 15 Oct 2015 09:46:45 +0000 (09:46 +0000)]
am
5c24a50e: Merge "generic_x86: delete system_server execmem"
* commit '
5c24a50e5fba6aad3319edc0770005e20ac0b9e1':
generic_x86: delete system_server execmem
Nick Kralevich [Thu, 15 Oct 2015 09:42:17 +0000 (09:42 +0000)]
Merge "generic_x86: delete system_server execmem"
Nick Kralevich [Thu, 15 Oct 2015 09:37:40 +0000 (02:37 -0700)]
generic_x86: delete system_server execmem
https://android-review.googlesource.com/175922 removed all uses
of system_server execmem and neverallowed it. The x86 emulator policy
inappropriately includes this rule. Delete it.
Fixes the following build breakage:
libsepol.report_failure: neverallow on line 473 of external/sepolicy/system_server.te (or line 12452 of policy.conf) violated by allow system_server system_server:process { execmem };
libsepol.check_assertions: 1 neverallow failures occurred
Error while expanding policy
Change-Id: I7fbfaa0a09e8f4e8a372d2f1a64bbe58d5302204
Peter Qiu [Thu, 15 Oct 2015 04:15:11 +0000 (04:15 +0000)]
am
cf58d1f5: am
7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '
cf58d1f5fed741836f6d06820dce5502e4770dd5':
Export include path to D-Bus headers for multilib builds
Peter Qiu [Thu, 15 Oct 2015 04:08:50 +0000 (04:08 +0000)]
am
7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '
7d3690eb3572477b65c04c7a7964a3367c2f69a6':
Export include path to D-Bus headers for multilib builds
Peter Qiu [Thu, 15 Oct 2015 04:00:38 +0000 (04:00 +0000)]
Merge "Export include path to D-Bus headers for multilib builds"
Ying Wang [Thu, 15 Oct 2015 01:21:28 +0000 (01:21 +0000)]
am
ef67c196: am
84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
ef67c1963fa7fec143d53f0e63792d80445f781c':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Thu, 15 Oct 2015 01:15:34 +0000 (01:15 +0000)]
am
84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
84c5ae523201f17b94b5b0afe85a9af3f26c8231':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Thu, 15 Oct 2015 01:10:44 +0000 (01:10 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 01:40:37 +0000 (18:40 -0700)]
Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
Note we need to quote the arguments in the arg list file.
This fixed "argument list too long" build error on Mac.
Bug:
24789595
Change-Id: I718f84e540d82bb83516824894a473b2961da278
Dan Willemsen [Wed, 14 Oct 2015 23:44:53 +0000 (16:44 -0700)]
Stop encoding absolute paths in symbols
GCC & Clang encode the current working directory into the symbol files.
Even if the binaries are stripped before being installed, the build-id
hash will be different. This means that two different checkouts will
produce different installed binaries, even if the sources are identical.
To prevent this, set PWD=/proc/self/cwd, so that it replaces the
absolute path with the static path /proc/self/cwd. With GCC, use
-fdebug-prefix-map to remove that static path. Our clang does not yet
support this flag, but it was merged in r250094.
This does change the behavior when using gdb -- you now need to be in
$ANDROID_BUILD_TOP before gdb will load the sources.
Bug:
24204119
Change-Id: I792d65b042b7a3fdc78d567c5a6e93cdf0141b9b
Peter Qiu [Wed, 14 Oct 2015 23:46:41 +0000 (16:46 -0700)]
Export include path to D-Bus headers for multilib builds
Bug:None
Change-Id: I6e3898c71f54ede08a27f5be93e95a2b219e5ea6
Ying Wang [Wed, 14 Oct 2015 23:40:46 +0000 (23:40 +0000)]
am
5b7aaeaa: am
ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit '
5b7aaeaa2e71cac30609263364082f33ce43bfbf':
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 23:32:18 +0000 (23:32 +0000)]
am
ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit '
ed4b0eeb435903d9be502dcebd2c000f143df575':
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
Ying Wang [Wed, 14 Oct 2015 23:08:53 +0000 (23:08 +0000)]
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit
16f93d5661afe23229ab3b08ddd5fde9bc9c7eb8.
Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
Steve Fung [Wed, 14 Oct 2015 22:54:51 +0000 (15:54 -0700)]
Add the Product ID to target_files.zip
When using the A/B updater, include the product id string to
target_files.zip.
This is needed by the Omaha backend.
Bug:
24946811
Change-Id: I2ce5f6cffe440c29a1820348ee215c71cec07861
Ying Wang [Wed, 14 Oct 2015 21:56:38 +0000 (21:56 +0000)]
am
5d012538: am
37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
5d012538fbebf44a97539e0430f7190c016d2a4c':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Wed, 14 Oct 2015 21:47:50 +0000 (21:47 +0000)]
am
37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
3757268466d8fe9438e45e989728a74f14a162c6':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Wed, 14 Oct 2015 21:43:41 +0000 (21:43 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Sami Tolvanen [Wed, 14 Oct 2015 20:58:12 +0000 (20:58 +0000)]
am
99fe0556: am
f635a586: Merge "Disable verity metadata for eng builds"
* commit '
99fe05567b5a76d2b3379ee91e9941272cb67219':
Disable verity metadata for eng builds
Sami Tolvanen [Wed, 14 Oct 2015 20:53:28 +0000 (20:53 +0000)]
am
f635a586: Merge "Disable verity metadata for eng builds"
* commit '
f635a586e8f4790455ef3dad8c1291c9eb95747e':
Disable verity metadata for eng builds
Ying Wang [Wed, 14 Oct 2015 20:51:27 +0000 (20:51 +0000)]
am
f8c6575f: am
191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit '
f8c6575fceed4de9d54d70f3c4165d68422e7b96':
Let get-prebuilt-src-arch return empty if the input is empty
Sami Tolvanen [Wed, 14 Oct 2015 20:49:32 +0000 (20:49 +0000)]
Merge "Disable verity metadata for eng builds"
Ying Wang [Wed, 14 Oct 2015 20:45:49 +0000 (20:45 +0000)]
am
191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit '
191da9bc08360409fa2951567e427168a8d1f76d':
Let get-prebuilt-src-arch return empty if the input is empty
Ying Wang [Wed, 14 Oct 2015 20:41:30 +0000 (20:41 +0000)]
Merge "Let get-prebuilt-src-arch return empty if the input is empty"
Sami Tolvanen [Wed, 20 May 2015 06:30:57 +0000 (07:30 +0100)]
Error correction: Append codes to verified partitions
Append error-correcting codes to verified partitions provided that
PRODUCT_SUPPORTS_VERITY_FEC is true.
This moves verity metadata to be after the hash tree, and requires
matching changes from
Ide48f581bbba77aed6132f77b309db71630d81ed
Bug:
21893453
Change-Id: I6945cbab99e214566a1f9d3702333f2dbbc35816
Sami Tolvanen [Tue, 15 Sep 2015 16:21:15 +0000 (17:21 +0100)]
Disable verity metadata for eng builds
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.
Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
(cherry picked from commit
beae6395fc934ae24955a5e96ec04cda5535d952)
Chih-Wei Huang [Sun, 4 Oct 2015 16:28:47 +0000 (00:28 +0800)]
Let get-prebuilt-src-arch return empty if the input is empty
The list of archs of a pure java apk (no native libs) is empty.
In this case get-prebuilt-src-arch still return 'none'.
If it's set to LOCAL_MODULE_TARGET_ARCH, it makes the apk
be incompatible with the building target. It's not good.
Just return empty in this case.
Change-Id: Ide75cdb08c8480c8e7d3a0ac59f41831fbc18bd5
Dan Willemsen [Wed, 14 Oct 2015 04:16:07 +0000 (21:16 -0700)]
fix merge of all-named-files-under
Change-Id: Iad4c30abdcfca1e73a2a3d525dfcea57f92c5c40
Dan Willemsen [Wed, 14 Oct 2015 04:13:22 +0000 (04:13 +0000)]
am
aaa03ede: am
b70b496f: am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
aaa03edef90a758c246da7c5e64dee1d6b3cb771':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 04:13:21 +0000 (04:13 +0000)]
am
1ed3bb79: am
2473c641: am
7a74e5ee: Add all-cpp-files-under
* commit '
1ed3bb79a9e7071913ce1f5f2a2a73c2b8620d74':
Add all-cpp-files-under
Dan Willemsen [Wed, 14 Oct 2015 04:10:09 +0000 (21:10 -0700)]
resolved conflicts for
b2415086 to mnc-dr-dev-plus-aosp
Change-Id: I99200c7efa00c52ab0e85b362c07fa3e919d44fd
Dan Willemsen [Wed, 14 Oct 2015 03:58:06 +0000 (03:58 +0000)]
am
b70b496f: am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
b70b496fd7574120e61e5e4ea3d63cf6192ba785':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 03:58:05 +0000 (03:58 +0000)]
am
2473c641: am
7a74e5ee: Add all-cpp-files-under
* commit '
2473c641baef739bed99c13036200ad8e9812d75':
Add all-cpp-files-under