Chih-hung Hsieh
54ac6cd527
Merge "Move mips64 target to clang by default."
...
am: b0d9108795
* commit 'b0d9108795caea4b88be42d208c7a21e73de4c9f':
Move mips64 target to clang by default.
2015-11-24 21:17:55 +00:00
Chih-hung Hsieh
917f4aea1d
Merge "Move mips target to clang by default."
...
am: 80d6b0a9c6
* commit '80d6b0a9c607b15a70512996b5a56b0499e426b4':
Move mips target to clang by default.
2015-11-24 21:17:47 +00:00
Chih-hung Hsieh
b0d9108795
Merge "Move mips64 target to clang by default."
2015-11-24 21:13:38 +00:00
Chih-hung Hsieh
80d6b0a9c6
Merge "Move mips target to clang by default."
2015-11-24 21:13:17 +00:00
Vince Harron
5806531f92
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)
2015-11-24 18:51:59 +00:00
Alex Klyubin
21f2e7bf0f
Merge "Clean up compiler warnings in signapk." am: 0aaf7aa53c
...
am: febce01c64
* commit 'febce01c64c18a4dea9d6f966939c3642b4381ed':
Clean up compiler warnings in signapk.
2015-11-24 17:39:18 +00:00
Alex Klyubin
febce01c64
Merge "Clean up compiler warnings in signapk."
...
am: 0aaf7aa53c
* commit '0aaf7aa53ce5d1a8b5880303a21b83959bf1a432':
Clean up compiler warnings in signapk.
2015-11-24 17:36:06 +00:00
Alex Klyubin
0aaf7aa53c
Merge "Clean up compiler warnings in signapk."
2015-11-24 17:30:42 +00:00
Alex Klyubin
c218d3eca3
Clean up compiler warnings in signapk.
...
Bug: 25794543
Change-Id: Ia7da4fbaed77af4020e5aa0b14fe5e1bd8521edb
2015-11-24 09:27:55 -08:00
Shinichiro Hamaji
336c2527e3
Merge "Prevent findleaves.py from traversing copies of " am: 84639d127b
...
am: 22a2efde22
* commit '22a2efde22b80152f4cdb75ecdc7c5068c64f509':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
2015-11-24 05:01:29 +00:00
Shinichiro Hamaji
22a2efde22
Merge "Prevent findleaves.py from traversing copies of "
...
am: 84639d127b
* commit '84639d127b50734ef670232bfa43a6fb9f3f0576':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
2015-11-24 04:57:26 +00:00
Shinichiro Hamaji
84639d127b
Merge "Prevent findleaves.py from traversing copies of $(OUT_DIR)"
2015-11-24 04:54:02 +00:00
Zach Jang
8fd4c77f45
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
2015-11-21 01:19:10 +00:00
Zach Jang
402e6d4c11
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
2015-11-21 01:15:41 +00:00
Zach Jang
8e9728630b
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
2015-11-21 01:12:28 +00:00
Zach Jang
a68c55822c
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
2015-11-21 01:07:24 +00:00
Zach Jang
8909bdfc4a
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
2015-11-21 01:01:49 +00:00
Zach Jang
c2aae56b82
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
2015-11-21 01:01:48 +00:00
Zach Jang
c7b96cdd5e
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
2015-11-21 00:58:36 +00:00
Zach Jang
daf00af42d
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
2015-11-21 00:58:35 +00:00
Zach Jang
2cd2a76c64
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
2015-11-21 00:55:17 +00:00
Zach Jang
10c8949d75
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
2015-11-21 00:55:17 +00:00
Zach Jang
645f200ae8
Update Security String to 2016-01-01 - DO NOT MERGE
...
am: 58cdbdc5ad
* commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:51:39 +00:00
Zach Jang
3ce70dfe46
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
2015-11-21 00:51:39 +00:00
Zach Jang
bcf2866fb1
Update Security String to 2016-01-01 to mnc-dev
...
am: 170459f438
* commit '170459f4385d35dd991549e1b545c376ca8df281':
Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:48:16 +00:00
Zach Jang
170459f438
Update Security String to 2016-01-01 to mnc-dev
...
http://b/25819582
Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
2015-11-20 22:55:19 +00:00
Zach Jang
58cdbdc5ad
Update Security String to 2016-01-01 - DO NOT MERGE
...
http://b/25819582
Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
2015-11-20 22:54:48 +00:00
Chih-Hung Hsieh
4dcd769f2c
Move mips64 target to clang by default.
...
Bug: 23163853
Change-Id: Ia3d449f908b09ce95b3de246c8c699d171dcbaa3
2015-11-20 13:35:44 -08:00
Chih-Hung Hsieh
990407e0a5
Move mips target to clang by default.
...
Bug: 23163853
Change-Id: I408ffd90ff2ff075e03962fffd1681fccf0319d3
2015-11-20 13:32:22 -08:00
Neil Fuller
ee4e247d24
Merge "Use sensible default locations for Java" am: 8f354bc8c2
...
am: 2fc3bef75a
* commit '2fc3bef75aae22178778bdaa407a0befa5345456':
Use sensible default locations for Java
2015-11-20 10:23:36 +00:00
Neil Fuller
2fc3bef75a
Merge "Use sensible default locations for Java"
...
am: 8f354bc8c2
* commit '8f354bc8c2d4c27d93c7e13a853e0c9088d6ba94':
Use sensible default locations for Java
2015-11-20 10:20:13 +00:00
Neil Fuller
8f354bc8c2
Merge "Use sensible default locations for Java"
2015-11-20 10:16:17 +00:00
Tao Bao
29c077e62a
releasetools: Fix the bug with TARGET_NO_RECOVERY.
...
am: 448dccbc7d
* commit '448dccbc7da2b666b2159632173d8896d276c6f3':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
2015-11-20 05:52:44 +00:00
Tao Bao
448dccbc7d
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 48550cceb0
)
2015-11-20 05:45:43 +00:00
Tao Bao
842e858f0c
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." am: 4ed5735a68
...
am: 733ba8f0e4
* commit '733ba8f0e473b214e55e3b93ded7739c35d85b10':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
2015-11-20 04:53:32 +00:00
Tao Bao
733ba8f0e4
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
...
am: 4ed5735a68
* commit '4ed5735a68090e9eec240693ff6b97ea57576151':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
2015-11-20 04:50:31 +00:00
Tao Bao
4ed5735a68
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
2015-11-20 04:47:42 +00:00
Tao Bao
398c855593
Override properties that point to out/ directory.
...
am: cb219828ff
-s ours
* commit 'cb219828ff70adcbf867968ea83ad42d03efa958':
Override properties that point to out/ directory.
2015-11-20 04:44:10 +00:00
Tao Bao
e4d716e38d
Pack file_contexts into target_files zip.
...
am: a6a3aa9398
-s ours
* commit 'a6a3aa9398f6a27693521abd2601462a78a81c56':
Pack file_contexts into target_files zip.
2015-11-20 04:40:43 +00:00
Alex Deymo
c53ec533ca
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
...
am: d06e1c16d8
* commit 'd06e1c16d856f061065a09f83c3fab445263dc68':
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
2015-11-20 04:11:55 +00:00
Alex Deymo
9dd9703fb0
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.
2015-11-20 04:11:47 +00:00
Alex Deymo
19f4946486
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.
2015-11-20 04:08:00 +00:00
Ying Wang
07001d7cc5
Merge "Increase droiddoc -J-Xmx to 1600MB." am: 01f49a3d5e
...
am: 59ab005dde
* commit '59ab005dde521722129c5264cc52d00963d48609':
Increase droiddoc -J-Xmx to 1600MB.
2015-11-20 02:41:14 +00:00
Ying Wang
59ab005dde
Merge "Increase droiddoc -J-Xmx to 1600MB."
...
am: 01f49a3d5e
* commit '01f49a3d5e5d8f4fdd83d1b74a230f8160aabe08':
Increase droiddoc -J-Xmx to 1600MB.
2015-11-20 02:38:00 +00:00
Ying Wang
01f49a3d5e
Merge "Increase droiddoc -J-Xmx to 1600MB."
2015-11-20 02:33:11 +00:00
Ying Wang
02bcb27b4a
Increase droiddoc -J-Xmx to 1600MB.
...
As we occasionally see java.lang.OutOfMemoryError when running
doc-comment-check-docs.
Bug: 25787786
Change-Id: I6c505c96ec36d09d28d400e03027b169870c49bb
2015-11-19 18:31:01 -08:00
Tao Bao
48550cceb0
releasetools: Fix the bug with TARGET_NO_RECOVERY.
...
The packaging script is broken when we set TARGET_NO_RECOVERY and
SYSTEM_ROOT_IMAGE both. With TARGET_NO_RECOVERY set, we don't have
RECOVERY/RAMDISK/etc/recovery.fstab. It thus fails the assertion in
common.LoadRecoveryFSTab() that "/" must exist in fstab when enabling
SYSTEM_ROOT_IMAGE.
Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
2015-11-19 17:14:21 -08:00
Tao Bao
cb219828ff
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 84e7568b1f
)
2015-11-19 17:02:13 -08:00
Tao Bao
a6a3aa9398
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 aa7318c384
)
2015-11-20 00:58:26 +00:00
Christopher Wiley
555a8f8910
Invoke the aidl-cpp compiler to generate C++
...
am: 7c6a7d09ba
-s ours
* commit '7c6a7d09baae72fdbf3f17c97fb41205d09562cd':
Invoke the aidl-cpp compiler to generate C++
2015-11-19 23:11:58 +00:00