OSDN Git Service
Piotr Jastrzebski [Tue, 17 Feb 2015 16:55:52 +0000 (16:55 +0000)]
Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.
Change-Id: Ie069c7a93e63b1df854b3137d984b96520562609
Neil Fuller [Fri, 20 Nov 2015 10:25:51 +0000 (10:25 +0000)]
Merge "Use sensible default locations for Java" am:
8f354bc8c2 am:
2fc3bef75a
am:
ee4e247d24
* commit '
ee4e247d24496da615d0270146c0a058074badc5':
Use sensible default locations for Java
Neil Fuller [Fri, 20 Nov 2015 10:23:36 +0000 (10:23 +0000)]
Merge "Use sensible default locations for Java" am:
8f354bc8c2
am:
2fc3bef75a
* commit '
2fc3bef75aae22178778bdaa407a0befa5345456':
Use sensible default locations for Java
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 05:56:17 +0000 (05:56 +0000)]
releasetools: Fix the bug with TARGET_NO_RECOVERY. am:
448dccbc7d
am:
29c077e62a
* commit '
29c077e62aca63bc24fab2f179813c587a5c76d0':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
Tao Bao [Fri, 20 Nov 2015 05:52:44 +0000 (05:52 +0000)]
releasetools: Fix the bug with TARGET_NO_RECOVERY.
am:
448dccbc7d
* commit '
448dccbc7da2b666b2159632173d8896d276c6f3':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
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 that
"/" must exist in fstab when enabling SYSTEM_ROOT_IMAGE.
Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
(cherry picked from commit
48550cceb0bc4a7a0ec05aa87f8b5872b9ac7246)
Tao Bao [Fri, 20 Nov 2015 04:56:46 +0000 (04:56 +0000)]
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." am:
4ed5735a68 am:
733ba8f0e4
am:
842e858f0c
* commit '
842e858f0c235ff7a95091e1d7963ab0947d5573':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
Tao Bao [Fri, 20 Nov 2015 04:53:32 +0000 (04:53 +0000)]
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." am:
4ed5735a68
am:
733ba8f0e4
* commit '
733ba8f0e473b214e55e3b93ded7739c35d85b10':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
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."
Tao Bao [Fri, 20 Nov 2015 04:47:26 +0000 (04:47 +0000)]
Override properties that point to out/ directory. am:
cb219828ff -s ours
am:
398c855593
* commit '
398c8555935edd067df8ab8e85be4c63ccb271ff':
Override properties that point to out/ directory.
Tao Bao [Fri, 20 Nov 2015 04:44:10 +0000 (04:44 +0000)]
Override properties that point to out/ directory.
am:
cb219828ff -s ours
* commit '
cb219828ff70adcbf867968ea83ad42d03efa958':
Override properties that point to out/ directory.
Tao Bao [Fri, 20 Nov 2015 04:44:08 +0000 (04:44 +0000)]
Pack file_contexts into target_files zip. am:
a6a3aa9398 -s ours
am:
e4d716e38d
* commit '
e4d716e38d19ad5e0dd139ddcbc2a94719e2e33f':
Pack file_contexts into target_files zip.
Tao Bao [Fri, 20 Nov 2015 04:40:43 +0000 (04:40 +0000)]
Pack file_contexts into target_files zip.
am:
a6a3aa9398 -s ours
* commit '
a6a3aa9398f6a27693521abd2601462a78a81c56':
Pack file_contexts into target_files zip.
Alex Deymo [Fri, 20 Nov 2015 04:14:30 +0000 (04:14 +0000)]
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS. am:
d06e1c16d8
am:
c53ec533ca
* commit '
c53ec533ca3836d8c5d6e2ab5117e5703621e2bd':
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
Alex Deymo [Fri, 20 Nov 2015 04:14:23 +0000 (04:14 +0000)]
Pack META/ab_partitions.txt when using the A/B OTA updater. am:
d22f7eb3ec -s ours
am:
9dd9703fb0
* commit '
9dd9703fb01c46f034ad338a53f7a7deac0f8ddb':
Pack META/ab_partitions.txt when using the A/B OTA updater.
Alex Deymo [Fri, 20 Nov 2015 04:14:16 +0000 (04:14 +0000)]
DO NOT MERGE Pack the update_engine_config.txt when using the A/B OTA updater. am:
b6ef41dc30 -s ours
am:
19f4946486 -s ours
* commit '
19f4946486af9b3e0d17fc97f29b2242f265ca45':
DO NOT MERGE Pack the update_engine_config.txt when using the A/B OTA updater.
Alex Deymo [Fri, 20 Nov 2015 04:11:55 +0000 (04:11 +0000)]
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
am:
d06e1c16d8
* commit '
d06e1c16d856f061065a09f83c3fab445263dc68':
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
Alex Deymo [Fri, 20 Nov 2015 04:11:47 +0000 (04:11 +0000)]
Pack META/ab_partitions.txt when using the A/B OTA updater.
am:
d22f7eb3ec -s ours
* commit '
d22f7eb3eca093b58d3c0f496ab84d881eaff3f4':
Pack META/ab_partitions.txt when using the A/B OTA updater.
Alex Deymo [Fri, 20 Nov 2015 04:08:00 +0000 (04:08 +0000)]
DO NOT MERGE Pack the update_engine_config.txt when using the A/B OTA updater.
am:
b6ef41dc30 -s ours
* commit '
b6ef41dc30eb069f1bda1d2b77152700114f024c':
DO NOT MERGE Pack the update_engine_config.txt when using the A/B OTA updater.
Ying Wang [Fri, 20 Nov 2015 02:44:32 +0000 (02:44 +0000)]
Merge "Increase droiddoc -J-Xmx to 1600MB." am:
01f49a3d5e am:
59ab005dde
am:
07001d7cc5
* commit '
07001d7cc5c410835a49deb9fbfd0f190a4561ea':
Increase droiddoc -J-Xmx to 1600MB.
Ying Wang [Fri, 20 Nov 2015 02:41:14 +0000 (02:41 +0000)]
Merge "Increase droiddoc -J-Xmx to 1600MB." am:
01f49a3d5e
am:
59ab005dde
* commit '
59ab005dde521722129c5264cc52d00963d48609':
Increase droiddoc -J-Xmx to 1600MB.
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
Tao Bao [Sun, 19 Jul 2015 09:38:53 +0000 (02:38 -0700)]
Override properties that point to out/ directory.
A few properties are stored as links to the files in the out/
directory, which are no longer available when (re)packing from
target_files zip. Redirect those properties to the actual files in
the unzipped directory when repacking.
Change-Id: I18e930cbea224ab9c6db8d4e721b1c266a671db6
(cherry picked from commit
84e7568b1fb6264c8a0b8e38ef8ed4ec78325061)
Tao Bao [Thu, 9 Jul 2015 18:51:16 +0000 (11:51 -0700)]
Pack file_contexts into target_files zip.
file_contexts (specified by SELINUX_FC) is needed both when building
and (re)packaging. We used to use the copy in out/ when building, and
looked for the copy in BOOT/RAMDISK/ when packaging from target_files
zip. With system_root_image enabled, the file_contexts needed for
building and packaging might be different from the one on device. So
we explicitly pack the file as META/file_contexts in target_files zip.
Also refactor out the overriding of selinux_fc property into
common.LoadInfoDict().
Change-Id: I0781a147319148c76d989d8f29d5ef766a502dbd
(cherry picked from commit
aa7318c3849095aeb3bea00efbf303c0c40a089d)
Christopher Wiley [Fri, 20 Nov 2015 00:16:43 +0000 (00:16 +0000)]
Invoke the aidl-cpp compiler to generate C++ am:
7c6a7d09ba -s ours
am:
555a8f8910
* commit '
555a8f891004e1b332f34146cac94eac79f37643':
Invoke the aidl-cpp compiler to generate C++
Tao Bao [Fri, 20 Nov 2015 00:15:52 +0000 (00:15 +0000)]
releasetools: Pack updatable images into IMAGES/ for A/B update. am:
26259ef4d7
am:
84d5b4def9
* commit '
84d5b4def99b0ece5d8b9eee0008e231a041c40b':
releasetools: Pack updatable images into IMAGES/ for A/B update.
Christopher Wiley [Thu, 19 Nov 2015 23:11:58 +0000 (23:11 +0000)]
Invoke the aidl-cpp compiler to generate C++
am:
7c6a7d09ba -s ours
* commit '
7c6a7d09baae72fdbf3f17c97fb41205d09562cd':
Invoke the aidl-cpp compiler to generate C++
Tao Bao [Thu, 19 Nov 2015 23:01:03 +0000 (23:01 +0000)]
releasetools: Pack updatable images into IMAGES/ for A/B update.
am:
26259ef4d7
* commit '
26259ef4d7dad3d55475fddefb0bd37327183544':
releasetools: Pack updatable images into IMAGES/ for A/B update.
Christopher Wiley [Thu, 19 Nov 2015 22:18:14 +0000 (22:18 +0000)]
Merge "Fix race in C++ AIDL file generation" am:
b2055df782 am:
dbc3d09ca6
am:
bcc7754581
* commit '
bcc7754581b640e9d6c85afa033665ad22209b11':
Fix race in C++ AIDL file generation
Colin Cross [Thu, 19 Nov 2015 22:18:07 +0000 (22:18 +0000)]
Merge "Switch to using kati env script" am:
7926e42209 am:
d924c14097
am:
f7f4ac1cfb
* commit '
f7f4ac1cfbfc594b0990666abb6d5b8f210e1652':
Switch to using kati env script
Christopher Wiley [Thu, 19 Nov 2015 22:12:25 +0000 (22:12 +0000)]
Merge "Fix race in C++ AIDL file generation" am:
b2055df782
am:
dbc3d09ca6
* commit '
dbc3d09ca6ad5c7116b317dc4199ce64f0636e68':
Fix race in C++ AIDL file generation
Colin Cross [Thu, 19 Nov 2015 22:12:17 +0000 (22:12 +0000)]
Merge "Switch to using kati env script" am:
7926e42209
am:
d924c14097
* commit '
d924c140976c9fc1db0f2a2f7b7da120c423f3bf':
Switch to using kati env script
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:36:53 +0000 (19:36 +0000)]
Merge "Export generated AIDL headers" am:
0c595d4730 am:
a626a5f6d9
am:
4d7e9757db
* commit '
4d7e9757db9d3c26aefa09ec4567db30fbe5cc86':
Export generated AIDL headers
Christopher Wiley [Thu, 19 Nov 2015 19:31:14 +0000 (19:31 +0000)]
Merge "Export generated AIDL headers" am:
0c595d4730
am:
a626a5f6d9
* commit '
a626a5f6d953f03f75a5c40725077aae9d7b95ba':
Export generated AIDL headers
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
Tao Bao [Thu, 19 Nov 2015 18:45:56 +0000 (18:45 +0000)]
Add ro.build.ab_update property. am:
532fdf4479
am:
c684a97329
* commit '
c684a973299fa21ed945db8ccca2034e7a5b12b3':
Add ro.build.ab_update property.
Tao Bao [Thu, 19 Nov 2015 18:45:50 +0000 (18:45 +0000)]
build: Fix "adb shell" in recovery for system_root_image. am:
f4d759930c
am:
7ae2864e02
* commit '
7ae2864e02b1bb2b474ef20287587d3bae4530d1':
build: Fix "adb shell" in recovery for system_root_image.
Tao Bao [Thu, 19 Nov 2015 18:45:44 +0000 (18:45 +0000)]
releasetools: Support packaging for system_root_image. am:
b11d2c5dd6 -s ours
am:
a968ef1013
* commit '
a968ef10131297b7e3018033177d417da5548e61':
releasetools: Support packaging for system_root_image.
Tao Bao [Thu, 19 Nov 2015 18:42:52 +0000 (18:42 +0000)]
Add ro.build.ab_update property.
am:
532fdf4479
* commit '
532fdf4479acb50cdb480e6fdfe24f0698fcd67b':
Add ro.build.ab_update property.
Tao Bao [Thu, 19 Nov 2015 18:42:46 +0000 (18:42 +0000)]
build: Fix "adb shell" in recovery for system_root_image.
am:
f4d759930c
* commit '
f4d759930c8b612cba9827d35232a205884295dc':
build: Fix "adb shell" in recovery for system_root_image.
Tao Bao [Thu, 19 Nov 2015 18:42:38 +0000 (18:42 +0000)]
releasetools: Support packaging for system_root_image.
am:
b11d2c5dd6 -s ours
* commit '
b11d2c5dd687aac12ee187a07f1d392193fe4d9c':
releasetools: Support packaging for system_root_image.
Tao Bao [Thu, 19 Nov 2015 18:40:45 +0000 (18:40 +0000)]
build: Support packaging for system_root_image. am:
97b906b004 -s ours
am:
64250c7ca7
* commit '
64250c7ca791d1f040cef62fae8b22b736ba8d2b':
build: Support packaging for system_root_image.
Tao Bao [Thu, 19 Nov 2015 18:37:20 +0000 (18:37 +0000)]
build: Support packaging for system_root_image.
am:
97b906b004 -s ours
* commit '
97b906b004f29551b222b4b68dccc84a20ee6508':
build: Support packaging for system_root_image.
Tao Bao [Thu, 19 Nov 2015 18:35:03 +0000 (18:35 +0000)]
Support systems that use a full copy of recovery image. am:
6ed1491402 -s ours
am:
7373166006
* commit '
73731660067189922e71686f6ed3a4ff204ba5b2':
Support systems that use a full copy of recovery image.
Tao Bao [Thu, 19 Nov 2015 18:32:03 +0000 (18:32 +0000)]
Support systems that use a full copy of recovery image.
am:
6ed1491402 -s ours
* commit '
6ed1491402e5db6450388147991e66e5938744ac':
Support systems that use a full copy of recovery image.
Daniel Rosenberg [Thu, 19 Nov 2015 18:30:02 +0000 (18:30 +0000)]
build: core: Fix issue in recovery am:
752ecc219a
am:
0629593b68
* commit '
0629593b68bb4b45ee97d205b86f1a67de6ac146':
build: core: Fix issue in recovery
Daniel Rosenberg [Thu, 19 Nov 2015 18:29:55 +0000 (18:29 +0000)]
Add support for system images that contain the root directory am:
b3b8ce6241 -s ours
am:
336dbc876a
* commit '
336dbc876acddcdaf1a70b800b70804e6dfde74a':
Add support for system images that contain the root directory
Daniel Rosenberg [Thu, 19 Nov 2015 18:25:30 +0000 (18:25 +0000)]
build: core: Fix issue in recovery
am:
752ecc219a
* commit '
752ecc219a6075cf565691417c717a0ab7da359d':
build: core: Fix issue in recovery
Daniel Rosenberg [Thu, 19 Nov 2015 18:25:22 +0000 (18:25 +0000)]
Add support for system images that contain the root directory
am:
b3b8ce6241 -s ours
* commit '
b3b8ce624180a6857d776d418952767357b35ef9':
Add support for system images that contain the root directory
Daniel Rosenberg [Thu, 19 Nov 2015 18:23:24 +0000 (18:23 +0000)]
Add ro.build.system_root_image am:
fa7f9f7e0c -s ours
am:
3e52a195f1
* commit '
3e52a195f1bd5e455a5fee2ce5f73780b3454d5e':
Add ro.build.system_root_image
Daniel Rosenberg [Thu, 19 Nov 2015 18:19:24 +0000 (18:19 +0000)]
Add ro.build.system_root_image
am:
fa7f9f7e0c -s ours
* commit '
fa7f9f7e0c63010a8f987134418ca3c598bb6d5a':
Add ro.build.system_root_image
Tao Bao [Thu, 19 Nov 2015 18:17:29 +0000 (18:17 +0000)]
Honor TARGET_NO_RECOVERY flag. am:
37b96ef26b -s ours
am:
a7fa9aca82
* commit '
a7fa9aca82e8af21a3a354d9b241551406d1070c':
Honor TARGET_NO_RECOVERY flag.
Tao Bao [Thu, 19 Nov 2015 18:14:02 +0000 (18:14 +0000)]
Honor TARGET_NO_RECOVERY flag.
am:
37b96ef26b -s ours
* commit '
37b96ef26bafb6f9d9f3e5bea57c70f84d68399c':
Honor TARGET_NO_RECOVERY flag.
Tao Bao [Thu, 19 Nov 2015 18:11:41 +0000 (18:11 +0000)]
DO NOT MERGE Change the cache partition size check into warnings. am:
116977c7db -s ours
am:
bb1b54444f -s ours
* commit '
bb1b54444fac3e33757d53083acc50dccc455dd4':
DO NOT MERGE Change the cache partition size check into warnings.
Tao Bao [Thu, 19 Nov 2015 18:09:00 +0000 (18:09 +0000)]
DO NOT MERGE Change the cache partition size check into warnings.
am:
116977c7db -s ours
* commit '
116977c7dba5ff79d1119a30966f918d72efedeb':
DO NOT MERGE Change the cache partition size check into warnings.
Tao Bao [Thu, 19 Nov 2015 18:07:16 +0000 (18:07 +0000)]
build: Don\'t call make_recovery_patch if there\'s no recovery. am:
60ad0cdc22 -s ours
am:
0049807543
* commit '
0049807543cee047b15738e6d839001887a222a2':
build: Don't call make_recovery_patch if there's no recovery.
Dan Albert [Thu, 19 Nov 2015 18:07:03 +0000 (18:07 +0000)]
Fix using libc++_static in dynamic binaries. am:
e10bb316b1
am:
d7c935c36d
* commit '
d7c935c36d188097490da44d2480c135ac331fd4':
Fix using libc++_static in dynamic binaries.
Dan Albert [Thu, 19 Nov 2015 18:06:55 +0000 (18:06 +0000)]
Cleanup libc++ configuration. am:
ea07676552 -s ours
am:
924d047e2c
* commit '
924d047e2cf262b2838a73f6f3422a7af33c2308':
Cleanup libc++ configuration.
Tao Bao [Thu, 19 Nov 2015 18:03:26 +0000 (18:03 +0000)]
build: Don\'t call make_recovery_patch if there\'s no recovery.
am:
60ad0cdc22 -s ours
* commit '
60ad0cdc226c9e28b8298b464dfa602ddcebce81':
build: Don't call make_recovery_patch if there's no recovery.
Dan Albert [Thu, 19 Nov 2015 17:58:26 +0000 (17:58 +0000)]
Fix using libc++_static in dynamic binaries.
am:
e10bb316b1
* commit '
e10bb316b14fe6707087dfe1f7603aaffcd73a07':
Fix using libc++_static in dynamic binaries.
Dan Albert [Thu, 19 Nov 2015 17:58:18 +0000 (17:58 +0000)]
Cleanup libc++ configuration.
am:
ea07676552 -s ours
* commit '
ea07676552f18ccb01bbbfe6e34dc6c0ac88d3be':
Cleanup libc++ configuration.
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:30:25 +0000 (16:30 +0000)]
Merge "Rename AArch64 ASan target runtime library to match upstream convention." am:
af9e29d040 am:
4b191b40b7
am:
fb41a5fa7a
* commit '
fb41a5fa7a65388f537f607d0dada4f0fee0c5d2':
Rename AArch64 ASan target runtime library to match upstream convention.
Stephen Hines [Thu, 19 Nov 2015 16:25:16 +0000 (16:25 +0000)]
Merge "Rename AArch64 ASan target runtime library to match upstream convention." am:
af9e29d040
am:
4b191b40b7
* commit '
4b191b40b7f1733fc98645cce1d56cb73b66c1cd':
Rename AArch64 ASan target runtime library to match upstream convention.
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."
Dan Albert [Thu, 19 Nov 2015 06:42:13 +0000 (06:42 +0000)]
Merge "Really allow overriding the LLVM prebuilts path." am:
ec18c0fdfe am:
e3b4114410
am:
9e032bec42
* commit '
9e032bec42dd508cc377aa3fa0d52d1f1ffb2661':
Really allow overriding the LLVM prebuilts path.
Dan Albert [Thu, 19 Nov 2015 06:37:30 +0000 (06:37 +0000)]
Merge "Really allow overriding the LLVM prebuilts path." am:
ec18c0fdfe
am:
e3b4114410
* commit '
e3b41144107d74495baf59527c48cb6f8e95e667':
Really allow overriding the LLVM prebuilts path.
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."
Alex Deymo [Fri, 23 Oct 2015 01:15:27 +0000 (18:15 -0700)]
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
In order to have all the A/B updater variables in the same AB_OTA_
namespace we rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
Bug: None
Test: `make dist` includes the partitions.txt file if properly configured.
Change-Id: Ied4faabd7e2f0ab8a5007afb44ad2f38df8d630d
(cherry picked from commit
49be2b115c558505e0f5972e5758dcea9b3f0bde)
Alex Deymo [Fri, 2 Oct 2015 00:38:09 +0000 (17:38 -0700)]
Pack META/ab_partitions.txt when using the A/B OTA updater.
The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.
Bug:
24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip
Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
(cherry picked from commit
8925d334c3d9932526242ad78ec7a0c23627c3a8)
Alex Deymo [Wed, 30 Sep 2015 02:05:37 +0000 (19:05 -0700)]
DO NOT MERGE Pack the update_engine_config.txt when using the A/B OTA updater.
This config file pulled directly from the source specifies the update
payload version supported by the code. When generating an incremental
update payload for the A/B updater, the generated payload format will
match the version supported by the old version.
Bug:
24406755
Test: `make dist` on Brillo.
Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576
(cherry picked from commit
70067acd663df3fb0a747085f3d928c4b1777154)
Colin Cross [Thu, 19 Nov 2015 03:24:27 +0000 (03:24 +0000)]
Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts" am:
153af5a27e am:
b35469cb90
am:
e3bbfe6ba3
* commit '
e3bbfe6ba3e0dd3883b0b6f10736dd42b7399011':
Support LOCAL_ACP_UNAVAILABLE for prebuilts
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
Daichi Hirono [Wed, 18 Nov 2015 23:38:20 +0000 (23:38 +0000)]
Merge "Include MtpDocumentsProvider in the system image."
Tao Bao [Wed, 18 Nov 2015 17:53:04 +0000 (17:53 +0000)]
Merge "releasetools: Pack updatable images into IMAGES/ for A/B update." am:
128466cea5 am:
2c1a4b9e88
am:
3fac901b0c
* commit '
3fac901b0cbc143c82395b5ba358d6ca8ad57375':
releasetools: Pack updatable images into IMAGES/ for A/B update.
Ying Wang [Wed, 18 Nov 2015 17:52:32 +0000 (17:52 +0000)]
Merge "Remove unnecessary inheritance layer between aliases." am:
2f05af74bc am:
10021ac19d
am:
1f5de04af7
* commit '
1f5de04af7ac7e8b4250dd4fa4bf7c7d8f2f110b':
Remove unnecessary inheritance layer between aliases.
Colin Cross [Wed, 18 Nov 2015 17:19:11 +0000 (17:19 +0000)]
Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts" am:
153af5a27e
am:
b35469cb90
* commit '
b35469cb90bd5c692c7c1aef6066d908adc869c3':
Support LOCAL_ACP_UNAVAILABLE for prebuilts
Daichi Hirono [Wed, 18 Nov 2015 04:00:40 +0000 (13:00 +0900)]
Include MtpDocumentsProvider in the system image.
BUG=
25731385
Change-Id: I9fa90a5c4a0bca3ab7d36968b1e3b40d60d55d31
Dan Albert [Wed, 18 Nov 2015 00:22:15 +0000 (00:22 +0000)]
Merge "Allow overriding the LLVM prebuilts path." am:
9119f14943 am:
c00e0b841a
am:
7cb503cf65
* commit '
7cb503cf65a43260e00efc00793af259dd9c819c':
Allow overriding the LLVM prebuilts path.
Bart Sears [Wed, 18 Nov 2015 00:19:39 +0000 (00:19 +0000)]
Bart Sears [Wed, 18 Nov 2015 00:19:32 +0000 (00:19 +0000)]
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