Tao Bao
e54c2150ea
Merge "releasetools: Always create IMAGES/ directory." am: db7dfacb96
am: a41e00784b
...
am: 32c91c9c31
Change-Id: I2aeb55b993bbc90ea2945ae6c00128c0edd033ca
2017-11-20 22:57:27 +00:00
Tao Bao
32c91c9c31
Merge "releasetools: Always create IMAGES/ directory." am: db7dfacb96
...
am: a41e00784b
Change-Id: I91f7bc071f531f10ed8d49e3eab06ca1f1abd9b1
2017-11-20 22:52:50 +00:00
Tao Bao
a41e00784b
Merge "releasetools: Always create IMAGES/ directory."
...
am: db7dfacb96
Change-Id: Iaede3e35fdd64dc748a98f625d390f0f38cd7e4a
2017-11-20 22:50:01 +00:00
Treehugger Robot
db7dfacb96
Merge "releasetools: Always create IMAGES/ directory."
2017-11-20 22:39:37 +00:00
Tao Bao
ae396d9b0c
releasetools: Always create IMAGES/ directory.
...
AddImagesToTargetFiles() takes either a zip file, or a zip root as
input. We used to create IMAGES/ directory only when working with zip
root input. Commit 262bf3f0b5
has changed
to also stage boot / recovery images there when working with a zip file.
This CL makes sure the directory is always available under both modes.
Bug: 63456822
Test: zip -d target_files.zip IMAGES/\*;
add_img_to_target_files.py target_files.zip
Test: sign_target_files_apks.py target_files.zip signed-target_files.zip
Change-Id: Iea91d0403cdec1b16bb93bb71d3ed06856b8f7c3
2017-11-20 12:44:18 -08:00
Steven Moreland
b718f5939b
Merge "Make more Treble make variables read only." am: cbf6fd55bf
am: 9642570a1b
...
am: 075b7cd7cc
Change-Id: If1731180797b6ce67d618e4e91e281bd20c42560
2017-11-20 19:20:47 +00:00
Steven Moreland
075b7cd7cc
Merge "Make more Treble make variables read only." am: cbf6fd55bf
...
am: 9642570a1b
Change-Id: Ibb439a4204b971078f275f8d97a31edb55195803
2017-11-20 19:18:37 +00:00
Steven Moreland
9642570a1b
Merge "Make more Treble make variables read only."
...
am: cbf6fd55bf
Change-Id: I4a42de556f54b2c8721ff7935b21bc11cc583075
2017-11-20 19:16:02 +00:00
Treehugger Robot
cbf6fd55bf
Merge "Make more Treble make variables read only."
2017-11-20 19:09:21 +00:00
Dan Willemsen
b53d364413
Merge "Switch aidl and zipalign prebuilts to build-tools" am: d6f229842a
am: 84d0f704eb
...
am: 2f67c165c3
Change-Id: I5866b54b96d6a9e1f6101740963fe19a79151478
2017-11-18 05:05:26 +00:00
Dan Willemsen
2f67c165c3
Merge "Switch aidl and zipalign prebuilts to build-tools" am: d6f229842a
...
am: 84d0f704eb
Change-Id: I26adc0efa82dbd0fdecdb16f6f664b2946af7f3e
2017-11-18 05:02:46 +00:00
Dan Willemsen
84d0f704eb
Merge "Switch aidl and zipalign prebuilts to build-tools"
...
am: d6f229842a
Change-Id: Ifec1c2c4d2daf601a0301cfef7a7325b7c511214
2017-11-18 04:59:41 +00:00
Dan Willemsen
d6f229842a
Merge "Switch aidl and zipalign prebuilts to build-tools"
2017-11-18 04:50:33 +00:00
Jae Shin
6f8db58b77
Merge "Generate VNDK snapshot zip as a build artifact" am: ca3ac0b8fc
am: 0dc14d28ae
...
am: 5e8ce3bae9
Change-Id: I7292a9bddd3104983a2527f1fa938ec56340091c
2017-11-18 03:28:42 +00:00
Jae Shin
5e8ce3bae9
Merge "Generate VNDK snapshot zip as a build artifact" am: ca3ac0b8fc
...
am: 0dc14d28ae
Change-Id: I77ab22973329514bdb85a1ba90d19aa0b5670a3f
2017-11-18 03:21:56 +00:00
Jae Shin
0dc14d28ae
Merge "Generate VNDK snapshot zip as a build artifact"
...
am: ca3ac0b8fc
Change-Id: Ie8ae3a739bd5c0697d2218e56f20e6576dfaa8d8
2017-11-18 03:16:33 +00:00
Jae Shin
ca3ac0b8fc
Merge "Generate VNDK snapshot zip as a build artifact"
2017-11-18 03:12:59 +00:00
Jae Shin
e6b7c84ef7
Generate VNDK snapshot zip as a build artifact
...
Define a new phony target 'vndk' such that 'make vndk dist'
outputs VNDK snapshot zip file to DIST_DIR.
Bug: 66059995
Test: m -j vndk dist TARGET_PRODUCT=aosp_{arch}_{a, ab}
BOARD_VNDK_VERSION=current
Change-Id: I6fd763a91205b21fba414d1f3068408a6826fad8
2017-11-18 03:11:55 +00:00
Dan Willemsen
6353304dc9
Switch aidl and zipalign prebuilts to build-tools
...
So that they can be updated more regularly than prebuilts/sdk/tools.
Bug: 69431993
Test: tapas ExactCalculator; m
Change-Id: Id07ab43f9d9e0c794cc15f21b75ae88c3547d8bd
2017-11-17 18:40:45 -08:00
Dan Willemsen
5d2b2f0de2
Merge "Add LOCAL_AAPT2_ONLY" am: da5fbe3c38
am: 9b0a730b14
...
am: 9f7c83dd8f
Change-Id: Ia1ad45679602e1b05634e4befef35c29ac04498a
2017-11-18 02:32:17 +00:00
Dan Willemsen
9f7c83dd8f
Merge "Add LOCAL_AAPT2_ONLY" am: da5fbe3c38
...
am: 9b0a730b14
Change-Id: I0a198be6a96513edc6d09ce89050932ae24c3156
2017-11-18 02:27:22 +00:00
Dan Willemsen
9b0a730b14
Merge "Add LOCAL_AAPT2_ONLY"
...
am: da5fbe3c38
Change-Id: I0105575b63e8dca60fad8661443089d168cc0c0e
2017-11-18 02:23:30 +00:00
Dan Willemsen
da5fbe3c38
Merge "Add LOCAL_AAPT2_ONLY"
2017-11-18 02:17:48 +00:00
Colin Cross
fe2cf3dda7
Merge "Remove FORCE from gpl_source.tgz" am: 1c0112f556
am: d86e80e04e
...
am: 311c3bb80e
Change-Id: I333229a7b5faebfdc9e293c93b175628bc56d41b
2017-11-18 00:54:07 +00:00
Tao Bao
a0e521ed16
Merge "releasetools: Fix the rebuilding of vbmeta.img." am: 2f7fab9ab9
am: 4727930bff
...
am: 497862c757
Change-Id: I7bb84a65a9ef6e3d4bbe98244f51819b569ecbc9
2017-11-18 00:53:15 +00:00
Colin Cross
311c3bb80e
Merge "Remove FORCE from gpl_source.tgz" am: 1c0112f556
...
am: d86e80e04e
Change-Id: I01ffeaea6b47f95d0e385e5a0bfb0332056c97a7
2017-11-18 00:48:32 +00:00
Tao Bao
497862c757
Merge "releasetools: Fix the rebuilding of vbmeta.img." am: 2f7fab9ab9
...
am: 4727930bff
Change-Id: If73915a15fa675ca635588c99bc4e6ed56e4be05
2017-11-18 00:44:28 +00:00
Colin Cross
d86e80e04e
Merge "Remove FORCE from gpl_source.tgz"
...
am: 1c0112f556
Change-Id: I23d8bbe4d8e16939d0209e06ef12d8dc5b0a0035
2017-11-18 00:44:24 +00:00
Colin Cross
1c0112f556
Merge "Remove FORCE from gpl_source.tgz"
2017-11-18 00:38:41 +00:00
Tao Bao
4727930bff
Merge "releasetools: Fix the rebuilding of vbmeta.img."
...
am: 2f7fab9ab9
Change-Id: Ie6c6536be7da1e85167c22de36832b4145255f19
2017-11-18 00:32:23 +00:00
Tao Bao
2f7fab9ab9
Merge "releasetools: Fix the rebuilding of vbmeta.img."
2017-11-18 00:22:14 +00:00
Dan Willemsen
bb6393c5a4
Add LOCAL_AAPT2_ONLY
...
This allows modules to specify that they may only be used from modules
using aapt2. Using aapt2 removes absolute path references to modules, so
this can be useful if a module is preparing to move its sources, or
replace itself with a prebuilt aar.
Test: m
Test: Label frameworks/support/design; m
Test: Label frameworks/support/v4; m
Test: build/soong/build_test.bash
Change-Id: Icfb3d4b19a6a0e3a3bb00091d2a97a4d88c0c761
2017-11-17 15:54:15 -08:00
Colin Cross
24e034a0bd
Remove FORCE from gpl_source.tgz
...
Package gpl_source.tgz directly into the dist directory (which is
always removed between build server builds) so that FORCE is not
needed. This prevents the build system from seeing a dirty rule
at the end of a make checkbuild dist.
Bug: 68062417
Test: m checkbuild dist
Change-Id: I4a9d9deb1611cc9ba266e8c1ac086a7ef48061c4
2017-11-17 14:05:19 -08:00
Colin Cross
a80df4238e
Merge changes from topics "soong_logtags", "droiddoc_srcjars" am: f1f66974c6
am: 0b1fc880e5
...
am: 99dc51da38
Change-Id: I711c56f11c785ff7d2ccadbf912d96b6854c94b7
2017-11-17 21:48:22 +00:00
Colin Cross
99dc51da38
Merge changes from topics "soong_logtags", "droiddoc_srcjars" am: f1f66974c6
...
am: 0b1fc880e5
Change-Id: I7cc4970a5be00762c0127db0502ab03cbdfb13e7
2017-11-17 21:42:51 +00:00
Colin Cross
0b1fc880e5
Merge changes from topics "soong_logtags", "droiddoc_srcjars"
...
am: f1f66974c6
Change-Id: Ic47da3913b34da288c258d61540892427ddf4506
2017-11-17 21:36:51 +00:00
Colin Cross
f1f66974c6
Merge changes from topics "soong_logtags", "droiddoc_srcjars"
...
* changes:
Allow converting logtags to java without merged logtags file
Add support for srcjars to droiddoc
2017-11-17 21:32:27 +00:00
Steven Moreland
0e6301c996
Make more Treble make variables read only.
...
This makes the following readonly if they are defined:
- PRODUCT_FULL_TREBLE_OVERRIDE
- Linker/sepolicy/vintf overrides for PRODUCT_FULL_TREBLE
Test: multiproduct_kati
Change-Id: Ib33e2e23b74a049e87667358bed331f86e517837
2017-11-17 12:46:54 -08:00
Tobias Thierer
ee67994a9b
Merge "Tweak comments for OpenJDK 9 build toolchain logic." am: 2655e57bbb
am: ea43e16f60
...
am: c5e4334bb3
Change-Id: I78ef2edd0579ddc3d6ee22e4df929a967e61b86d
2017-11-17 18:29:41 +00:00
Tobias Thierer
c5e4334bb3
Merge "Tweak comments for OpenJDK 9 build toolchain logic." am: 2655e57bbb
...
am: ea43e16f60
Change-Id: Ibb81b898d257b48a8435576035899bf1a4925f19
2017-11-17 18:27:35 +00:00
Tobias Thierer
ea43e16f60
Merge "Tweak comments for OpenJDK 9 build toolchain logic."
...
am: 2655e57bbb
Change-Id: I13b9520e95365dc2669d7a0c4832a322b7efca84
2017-11-17 18:25:32 +00:00
Tobias Thierer
2655e57bbb
Merge "Tweak comments for OpenJDK 9 build toolchain logic."
2017-11-17 18:20:39 +00:00
Chih-hung Hsieh
dfa1a5b3dc
Merge "Recognize new clang-tidy android-* warnings." am: 315761ace1
am: dafe61c817
...
am: c982ae3728
Change-Id: Icbdb34606e0bcebf5733904fe20cbd50e52abecb
2017-11-17 17:19:07 +00:00
Chih-hung Hsieh
c982ae3728
Merge "Recognize new clang-tidy android-* warnings." am: 315761ace1
...
am: dafe61c817
Change-Id: Iebf015a5351d46ba6331908c7a945fd661d1de6e
2017-11-17 17:16:58 +00:00
Chih-hung Hsieh
dafe61c817
Merge "Recognize new clang-tidy android-* warnings."
...
am: 315761ace1
Change-Id: I516702a4bad35c6a4ec34f33bf42fa004400a860
2017-11-17 17:13:27 +00:00
Chih-hung Hsieh
315761ace1
Merge "Recognize new clang-tidy android-* warnings."
2017-11-17 17:07:49 +00:00
Tobias Thierer
7ef760b832
Tweak comments for OpenJDK 9 build toolchain logic.
...
This addresses review comments on the preceding CL
http://r.android.com/539055
Test: Treehugger
Change-Id: Icb0674190db3d638546a0ed49dbcb97d0698e549
2017-11-17 15:35:59 +00:00
Tobias Thierer
2d6a42d182
Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9." am: 446c9ba370
am: 4ffaa14478
...
am: 24df8fa38f
Change-Id: I1ec375b4775db1e4e494193685a9fe86c243d56b
2017-11-17 15:27:30 +00:00
Tobias Thierer
24df8fa38f
Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9." am: 446c9ba370
...
am: 4ffaa14478
Change-Id: I89a3223bde03cf5b6d48da3125bb7ab043b89c1e
2017-11-17 15:23:29 +00:00
Tobias Thierer
4ffaa14478
Merge "Break EXPERIMENTAL_USE_OPENJDK9 into {USE,TARGET}_OPENJDK9."
...
am: 446c9ba370
Change-Id: I0254955fa16e8b35396f9f350c961031272c6583
2017-11-17 15:19:30 +00:00