Commit graph

41464 commits

Author SHA1 Message Date
TreeHugger Robot
6b005dc0d3 Merge "Export proguard flags from static android libraries and aar prebuilts" 2017-11-21 04:03:35 +00:00
Colin Cross
93c73f957f Merge "Convert signtos to Android.bp" am: 80ec993a58 am: bb051769c2
am: 0f36226f15

Change-Id: I834542c241e5d9071529f5960f010460fe6d9fdd
2017-11-21 03:38:21 +00:00
Colin Cross
0f36226f15 Merge "Convert signtos to Android.bp" am: 80ec993a58
am: bb051769c2

Change-Id: I3fef8edc7f1c901cf1fc67e16b83e3259a1ab5ad
2017-11-21 03:35:44 +00:00
Colin Cross
bb051769c2 Merge "Convert signtos to Android.bp"
am: 80ec993a58

Change-Id: I5ddb92b0ca0485b01860aaff6ae613d5276eedb8
2017-11-21 03:33:06 +00:00
Colin Cross
80ec993a58 Merge "Convert signtos to Android.bp" 2017-11-21 03:26:42 +00:00
Colin Cross
3c363ad729 Convert signtos to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: Ia468cde0492e64858b7a603deba9b22b95e56ff4
2017-11-21 03:26:31 +00:00
Bowgo Tsai
1b0dbfdc74 Merge "Revert "Reorder assert-max-image-size and AVB signing"" am: aac41d585c am: 8dbeec4e9e
am: 940d45fb04

Change-Id: I7e630a72bf1e7454c9144308f9470f6df9289fea
2017-11-21 03:11:47 +00:00
Bowgo Tsai
940d45fb04 Merge "Revert "Reorder assert-max-image-size and AVB signing"" am: aac41d585c
am: 8dbeec4e9e

Change-Id: I801fd6661d73260417ab2f13b740918181341bd0
2017-11-21 03:09:40 +00:00
Bowgo Tsai
8dbeec4e9e Merge "Revert "Reorder assert-max-image-size and AVB signing""
am: aac41d585c

Change-Id: I5e8b881da8588f7bb1730d49e0e35eb6aab9728a
2017-11-21 03:07:05 +00:00
Bowgo Tsai
aac41d585c Merge "Revert "Reorder assert-max-image-size and AVB signing"" 2017-11-21 03:02:19 +00:00
Bowgo Tsai
47e0b62d6e Revert "Reorder assert-max-image-size and AVB signing"
This reverts commit b855c0c304.

Change-Id: Ia82071bf42fcc6d15dabdf15f4eb5d1749c8cdb8
2017-11-21 02:39:51 +00:00
Bowgo Tsai
c3838bf620 Merge "Reorder assert-max-image-size and AVB signing" am: eea732dbcf am: d16f9c5301
am: d8cf3043b9

Change-Id: I9220a62e58e1033887e53bd429aa3a489f078a4d
2017-11-21 01:39:40 +00:00
Bowgo Tsai
d8cf3043b9 Merge "Reorder assert-max-image-size and AVB signing" am: eea732dbcf
am: d16f9c5301

Change-Id: I89e3ec2451bc1d9ffa74b648de74da2e18191937
2017-11-21 01:36:31 +00:00
Bowgo Tsai
d16f9c5301 Merge "Reorder assert-max-image-size and AVB signing"
am: eea732dbcf

Change-Id: I6140292228c48ea5db455841cab3a148099c31d9
2017-11-21 01:33:07 +00:00
Treehugger Robot
eea732dbcf Merge "Reorder assert-max-image-size and AVB signing" 2017-11-21 01:23:28 +00:00
Dan Willemsen
f19628d491 Merge "Switch gcnodir name from basename to just removing .so" am: c1d7537d99 am: b2cff60b8a
am: 7ba9c398ab

Change-Id: Icc495090da84050f783bf8f25b88f09209e9750a
2017-11-20 23:33:44 +00:00
Dan Willemsen
7ba9c398ab Merge "Switch gcnodir name from basename to just removing .so" am: c1d7537d99
am: b2cff60b8a

Change-Id: I0ebd3ab2437688acfc773c31d2cc79cafdef11b9
2017-11-20 23:17:50 +00:00
Dan Willemsen
b2cff60b8a Merge "Switch gcnodir name from basename to just removing .so"
am: c1d7537d99

Change-Id: Iebfc8f3b18d37f04ea92baf52b373ed3eea935c1
2017-11-20 23:14:16 +00:00
Treehugger Robot
c1d7537d99 Merge "Switch gcnodir name from basename to just removing .so" 2017-11-20 23:04:38 +00:00
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
Dan Willemsen
ba9badf8ec Switch gcnodir name from basename to just removing .so
$(basename) was catching all of the hidl services that have versions
like "1.0" in their name, marking the .0-service portion as a suffix to
be removed.

Instead just remove ".so" and assume that everything else isn't actually
a suffix.

Bug: 69271974
Test: NATIVE_COVERAGE=true COVERAGE_PATHS=hardware/interfaces m; compare
      ninja files
Change-Id: I76e27d9ab1f9d4862cc2607c5f2ed9c121879421
2017-11-20 13:03:25 -08: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