Commit Graph

41199 Commits

Author SHA1 Message Date
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 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 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 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 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 bf70c318b7 releasetools: Allow building AVB-enabled recovery.img.
Bug: 68224784
Test: Enable AVB on aosp_bullhead-userdebug. `m dist`. Note that the
      prebuilt vendor.img needs to be AVB-signed first.
Test: `m dist` with aosp_walleye-userdebug.
Change-Id: I18235e4d0dde6af71a96e46ec434480cc9a22bef
2017-11-20 12:44:18 -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 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
Jiyong Park f19117c560 Don't embed vendor libs into vendor apks.
Vendor apk can now access /vendor/lib. So there is no need for us to
embed the vendor libs into vendor apks. Reverting the old commits.

Revert "Embedding the JNI lib is controlled by PRODUCT_FULL_TREBLE"
This reverts commit a6b038ff4c.

Revert "Embed jni libs in vendor apks for treble-ized devices"
This reverts commit 1cb8dea625.

Bug: 69272876
Test: m -j ModemDiagnosticSystem (a vendor apk having JNI libs in walleye)
unzip -l /vendor/app/ModemDiagnosticSystem/ModemDiagnosticSystem.apk does not
have libmdsdiag.so in it. The so file is found in /vendor/lib64.

Change-Id: I7b96aa56b39bc45aca4810e6fb3f41ce2a1fc095
2017-11-20 11:01:54 +09:00
Jiyong Park 003ea369dd Ensure partition_tag is always set correctly
partition_tag is now set to either VENDOR_, OEM_, or ODM_
even when LOCAL_[VENDOR|OEM|ODM]_MODULE isn't set but LOCAL_MODULE_PATH
is explicitly set to under $(TARGET_OUT_[VENDOR|OEM|ODM]).

Test: build walleye

Change-Id: I0f902061889fe0af1c39f6222e54faa80dd15794
2017-11-20 11:01:50 +09: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 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 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 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
Chih-Hung Hsieh 1876acdd53 Add default -Wall -Werror or -Wall.
* Skip Android.bp, prebuilt, and HEADER_LIBRARIES targets.
* If neither -Wno-error nor -Werror is used, add default -Wall -Werror.
  However, if the build target is in a project
  under one of ANDROID_WARNING_ALLOWED_PROJECTS, add only -Wall.
* Dump name of modules using -Wno-error or added -Wall -Werror
  into file $(PRODUCT_OUT)/wall_werror.txt.

Bug: 66996870
Test: normal build
Change-Id: Ief8cf776e8613ed073a64dd271534688845d5c2c
2017-11-17 14:06:35 -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 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 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