OSDN Git Service
Colin Cross [Thu, 26 Nov 2015 17:38:34 +0000 (17:38 +0000)]
Merge "Build ijar for apps build" am:
ec4db56e58
am:
3b5dbebe8d
* commit '
3b5dbebe8d9a8beac49a8c16605df6afbec4de72':
Build ijar for apps build
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:46:29 +0000 (11:46 +0000)]
Merge "Fix generated-sources-dir-for for COMMON" am:
623799d3e0
am:
9c4bb4c1c0
* commit '
9c4bb4c1c079db6c6c87f30ea861d9bec1ee1df8':
Fix generated-sources-dir-for for COMMON
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:33:54 +0000 (05:33 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" am:
c9a1b27845
am:
27770abe27
* commit '
27770abe272eb54de5eea5fa94342c1393b681a0':
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
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:06:08 +0000 (00:06 +0000)]
Merge "target_files_diff: Allow writing outputs to file." am:
7b5eddd52b
am:
acd1b8e160
* commit '
acd1b8e160c8114bd07be2175388f7dcefe09687':
target_files_diff: Allow writing outputs to file.
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
Vince Harron [Tue, 24 Nov 2015 22:57:53 +0000 (22:57 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android am:
5806531f92 am:
e13b13c7f6
am:
aba12deedb
* commit '
aba12deedb9cdcf8ef01952de1cc51057d8d2bf7':
Shorten TARGET_BRAND from generic_<arch> to Android
Vince Harron [Tue, 24 Nov 2015 22:54:42 +0000 (22:54 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android am:
5806531f92
am:
e13b13c7f6
* commit '
e13b13c7f67b80a7e99147d76ce307d6bb5296db':
Shorten TARGET_BRAND from generic_<arch> to Android
Vince Harron [Tue, 24 Nov 2015 22:50:50 +0000 (22:50 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android
am:
5806531f92
* commit '
5806531f92a3670362ec8dceafd0079d51afbd18':
Shorten TARGET_BRAND from generic_<arch> to Android
Ying Wang [Tue, 24 Nov 2015 22:21:25 +0000 (22:21 +0000)]
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:04:55 +0000 (22:04 +0000)]
Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." am:
81bbac6a0f
am:
fdfd0b0d81
* commit '
fdfd0b0d8145ccead681d921cfd33ba4c57d64fc':
Don't delete META-INF in jack-java-to-dex when packing resources.
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:22:04 +0000 (21:22 +0000)]
Merge "Move mips64 target to clang by default." am:
b0d9108795
am:
54ac6cd527
* commit '
54ac6cd527eeb9784a0703a8ef0b017e290c813c':
Move mips64 target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:21:58 +0000 (21:21 +0000)]
Merge "Move mips target to clang by default." am:
80d6b0a9c6
am:
917f4aea1d
* commit '
917f4aea1d99c9155eee218d81d3f63b9b480709':
Move mips target to clang by default.
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."
Vince Harron [Thu, 29 Oct 2015 17:08:23 +0000 (10:08 -0700)]
Shorten TARGET_BRAND from generic_<arch> to Android
Switching to userdebug emulator images increased ro.build.fingerprint
Past the 91 character limit. This should bring the build server
builds under this limit.
Fixing it for local builds will be a bit more difficult.
Bug:
25829506
Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2
(cherry picked from commit
efbeab78d3581009b3da20991a3a83d733393f45)
Alex Klyubin [Tue, 24 Nov 2015 17:39:18 +0000 (17:39 +0000)]
Merge "Clean up compiler warnings in signapk." am:
0aaf7aa53c
am:
febce01c64
* commit '
febce01c64c18a4dea9d6f966939c3642b4381ed':
Clean up compiler warnings in signapk.
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 05:01:29 +0000 (05:01 +0000)]
Merge "Prevent findleaves.py from traversing copies of " am:
84639d127b
am:
22a2efde22
* commit '
22a2efde22b80152f4cdb75ecdc7c5068c64f509':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
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)"
Zach Jang [Sat, 21 Nov 2015 01:19:10 +0000 (01:19 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a am:
a68c55822c am:
8e9728630b
am:
402e6d4c11
* commit '
402e6d4c11796c6b1137b21346321707a18a2af5':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:15:41 +0000 (01:15 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a am:
a68c55822c
am:
8e9728630b
* commit '
8e9728630b2e552280b1e90b912e28d4b53dd93b':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:12:28 +0000 (01:12 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a
am:
a68c55822c
* commit '
a68c55822c115db2151b1d155566a06b01756d20':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:07:24 +0000 (01:07 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e
am:
8909bdfc4a
* commit '
8909bdfc4abd8ffc6511c864fe968530abe40b8a':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:01:49 +0000 (01:01 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours
am:
c7b96cdd5e
* commit '
c7b96cdd5e83ea7c62912bc779e7bc49c59023c7':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:01:48 +0000 (01:01 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438 am:
bcf2866fb1 am:
3ce70dfe46 am:
10c8949d75
am:
daf00af42d
* commit '
daf00af42d67098918a0c06b27002255cc5d34de':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 00:58:36 +0000 (00:58 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8
am:
2cd2a76c64 -s ours
* commit '
2cd2a76c64dead0b057b7e9a1223f67f9a9d2e7f':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:58:35 +0000 (00:58 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438 am:
bcf2866fb1 am:
3ce70dfe46
am:
10c8949d75
* commit '
10c8949d7503bad5450543774d8c0364d8c1fc36':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 00:55:17 +0000 (00:55 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438 am:
bcf2866fb1
am:
3ce70dfe46
* commit '
3ce70dfe467246c28290f8ca24c1f5319b46142b':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 00:55:17 +0000 (00:55 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad
am:
645f200ae8
* commit '
645f200ae8708414d06618989328dc3e3c84a917':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:51:39 +0000 (00:51 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438
am:
bcf2866fb1
* commit '
bcf2866fb1ea50ea31ede70f62b864332f61b980':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 00:51:39 +0000 (00:51 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE
am:
58cdbdc5ad
* commit '
58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:48:16 +0000 (00:48 +0000)]
Update Security String to 2016-01-01 to mnc-dev
am:
170459f438
* commit '
170459f4385d35dd991549e1b545c376ca8df281':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Fri, 20 Nov 2015 22:37:14 +0000 (14:37 -0800)]
Update Security String to 2016-01-01 to mnc-dev
http://b/
25819582
Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
Zach Jang [Fri, 20 Nov 2015 22:32:09 +0000 (14:32 -0800)]
Update Security String to 2016-01-01 - DO NOT MERGE
http://b/
25819582
Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
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: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: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: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: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: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: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: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 [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: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: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: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: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: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: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: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: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: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.
OSDN Git Service
