Commit graph

54006 commits

Author SHA1 Message Date
Bill Peckham
861ffd1588 Merge "Avoid adding VINTF manifest fragment more than once."
am: fd25038f8a

Change-Id: I44c12257269e039c78f20330fa5713775fec3b65
2019-08-14 16:04:02 -07:00
Bill Peckham
fd25038f8a Merge "Avoid adding VINTF manifest fragment more than once." 2019-08-14 22:44:30 +00:00
Tao Bao
0a712a0834 Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master 2019-08-14 21:46:17 +00:00
Xin Li
5e0e14531d DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
Bug: 134405016
Change-Id: I77df4ab2e9f680668c903a55394743b313082620
2019-08-14 11:35:07 -07:00
Tao Bao
c1966a8bdd Makefile uses add_img_to_target_files module.
Also pack additional tools into otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
(cherry picked from commit 1cf8bf0c14)
2019-08-14 10:44:53 -07:00
Tao Bao
f4157c5859 Merge "releasetools: Add more module building rules."
am: 39369d08fb

Change-Id: Ic422023eceae40922a6251f32982cc1141f86aac
2019-08-14 09:08:50 -07:00
Tao Bao
39369d08fb Merge "releasetools: Add more module building rules." 2019-08-14 15:33:33 +00:00
Bill Peckham
6733381fce Avoid adding VINTF manifest fragment more than once.
In the case of building a multilib library that defines LOCAL_VINTF_FRAGMENTS,
the previous code would create duplicate rules for the fragment. This change
uses the my_vintf_new_installed variable (which may be empty) to avoid the
duplication.

Bug: 139268165
Test: Verify that build warnings are gone, yet VINTF fragment still installed.
Change-Id: I579ec650019a29a6a105118ad5e5ae9376e8d9bc
2019-08-13 16:05:34 -07:00
Ramy Medhat
eef0efadb3 Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links."
am: f51a70b009

Change-Id: I08921d50243c3984a2edd518750465b58896b4d9
2019-08-13 10:48:10 -07:00
Ramy Medhat
f51a70b009 Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links." 2019-08-13 17:17:05 +00:00
Ramy Medhat
e5839f912b Add labels to rewrapper cc compile action. Prevent ccwrapper from being
used in links.

Test: Built aosp-arm64_eng with and without USE_RBE=1

Change-Id: I8d04069219a9467c3de9a028eb68e3115173f1e2
2019-08-12 14:13:31 -04:00
vichang
940002a285 Merge "Add new core-icu4j after separating icu4j from core-libart"
am: ba6135bd80

Change-Id: Iba62deb4e2bb8c906fd30baa074ba43a8d19ac62
2019-08-12 09:11:26 -07:00
vichang
ba6135bd80 Merge "Add new core-icu4j after separating icu4j from core-libart" 2019-08-12 15:36:44 +00:00
Inseob Kim
731737b92d Merge "Include headers and props to VNDK snapshot"
am: 3ca61ad9d9

Change-Id: Ibb2d23dfb79350fed1351020144e3a538d6ab160
2019-08-11 16:21:09 -07:00
Treehugger Robot
3ca61ad9d9 Merge "Include headers and props to VNDK snapshot" 2019-08-11 23:04:49 +00:00
Dan Willemsen
2b5e4acc6c Merge "Add dependencies for files in LOCAL_PROGUARD_FLAGS"
am: 2a36c97edd

Change-Id: I5584988f662c8c6845da3d4214a5ff1db9b0ed6e
2019-08-09 14:49:54 -07:00
Yifan Hong
461a045c21 Merge "Add virtual A/B product."
am: f555602f57

Change-Id: I500dc67078d199e98d082df51f2af7192cc3c9bf
2019-08-09 14:47:47 -07:00
Treehugger Robot
2a36c97edd Merge "Add dependencies for files in LOCAL_PROGUARD_FLAGS" 2019-08-09 21:31:32 +00:00
Yifan Hong
f555602f57 Merge "Add virtual A/B product." 2019-08-09 21:25:36 +00:00
Dan Willemsen
184305d9e9 Merge "Move TOP/TOPDIR to build/make/common/core.mk"
am: d1e2827fa5

Change-Id: I1a6270ad561b6479e8e9d012f671168d7882c9e4
2019-08-09 09:49:25 -07:00
Treehugger Robot
d1e2827fa5 Merge "Move TOP/TOPDIR to build/make/common/core.mk" 2019-08-09 16:29:14 +00:00
Dan Willemsen
829abaefee Add dependencies for files in LOCAL_PROGUARD_FLAGS
Do this by introducing a new LOCAL_PROGUARD_FLAGS_DEPS variable that we
can modify anytime we add a file reference to LOCAL_PROGUARD_FLAGS.

An alternative would have been to switch to LOCAL_PROGUARD_FLAG_FILES,
but that would have been much harder to ensure the same command line
ordering.

Bug: 130111713
Test: treehugger
Change-Id: If367197b30d563e0796f0cafa00be1f275f2c406
2019-08-09 09:19:52 -07:00
Tao Bao
cd79edb331 Merge "releasetools: Fix the target files diffing."
am: 6a52b34473

Change-Id: I852a255f7ad99718a96bae0df92ce54ceb543c0a
2019-08-08 16:35:04 -07:00
Tao Bao
6a52b34473 Merge "releasetools: Fix the target files diffing." 2019-08-08 22:55:45 +00:00
Dan Willemsen
8da52d4b9d Move TOP/TOPDIR to build/make/common/core.mk
So that they're set properly during dumpvars / product loading.

SHELL is already set in common/core.mk, so it's not necessary to be in
core/main.mk as well (which quickly loads core/config.mk, which loads
common/core.mk).

Test: get_build_var TOP
Test: get_build_var TOPDIR
Change-Id: I8179ac32628b74ccf29851dc53bf83cfb4b280fd
2019-08-08 10:58:09 -07:00
Steven Moreland
4880e3cfdd Merge "-D__ANDROID_NDK__ for SDK builds."
am: 0b690ed6d9

Change-Id: Ibe48a4cf8e94077597926912b09b12ae3724a396
2019-08-08 09:56:08 -07:00
Steven Moreland
0b690ed6d9 Merge "-D__ANDROID_NDK__ for SDK builds." 2019-08-08 16:22:53 +00:00
vichang
e611c35c95 Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES"
am: aa407a85b7

Change-Id: I8fb91f10a91bf1e115c94ec0ab6a74f6ac797d73
2019-08-08 04:24:18 -07:00
vichang
aa407a85b7 Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES" 2019-08-08 11:06:53 +00:00
Inseob Kim
316f77ba3c Include headers and props to VNDK snapshot
For all vndk snapshot libraries, header files exported by the libraries
will be included to the snapshot. Android.bp will contain necessary
information to link against/install vndk snapshot libraires:
export_include_dirs, export_system_include_dirs, export_flags, and
relative_install_path.

Bug: 132818174
Test: 1) VNDK_SNAPSHOT_BUILD_ARTIFACTS=true \
           development/vndk/snapshot/build.sh
Test: 2) development/vndk/snasphot/update.py
Test: 3) see contents of Android.bp and include directories
Change-Id: I3ed179b613ca51f7854dc819783a962a56b973eb
2019-08-08 18:46:31 +09:00
Tao Bao
3c7b2a658c releasetools: Add more module building rules.
This CL adds the building rules for the following tools:
- add_img_to_target_files
- check_ota_package_signature
- check_target_files_signatures
- img_from_target_files
- merge_target_files
- ota_package_parser
- sign_apex
- sign_target_files_apks
- validate_target_files

Bug: 63866463
Test: mmma -j build/make/tools/releasetools
Test: Run each tool above to ensure there's no missing dependency (in
      the exercised code path).
Change-Id: Ide5b9775939ed02c822109cbcf4224000d5472df
2019-08-07 22:35:42 -07:00
Tao Bao
ced94b337c Merge "releasetools: ota_from_target_files uses target_files_diff."
am: 69340f6885

Change-Id: I822a3bfa774c79d2c4789a84fa084361753cb24b
2019-08-07 21:41:21 -07:00
Tao Bao
69340f6885 Merge "releasetools: ota_from_target_files uses target_files_diff." 2019-08-08 04:07:51 +00:00
Peter Collingbourne
d5226eea18 Merge "Add "arm64-v8a-hwasan" to the supported ABI list in SANITIZE_TARGET=hwaddress builds."
am: 0b8c15b249

Change-Id: I120e005f560f89d0276b8de73f1ee1e6681895a4
2019-08-07 20:19:08 -07:00
Treehugger Robot
0b8c15b249 Merge "Add "arm64-v8a-hwasan" to the supported ABI list in SANITIZE_TARGET=hwaddress builds." 2019-08-08 03:01:39 +00:00
Yifan Hong
7d37b40c6e Add virtual A/B product.
- Add PRODUCT_VIRTUAL_AB_OTA(_RETROFIT)
- Set ro.virtual_ab.{enabled,retrofit} respectively.

A device will do the following to enable virtual a/b or retrofit:

$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota_retrofit.mk)

Bug: 135752105
Test: build with device with flag set
Change-Id: I6cb1207aef3ddcc40e215e20589abf995ec81aac
2019-08-07 18:31:33 -07:00
Justin Yun
66a0d43db2 Merge "Revert "Add product and system_ext partition for emulator""
am: 0c55b6d2cb

Change-Id: I112c27402c00276f2442daeb233ceee73814fe0e
2019-08-07 16:58:49 -07:00
Treehugger Robot
0c55b6d2cb Merge "Revert "Add product and system_ext partition for emulator"" 2019-08-07 23:44:58 +00:00
Justin Yun
b5570cf17b Revert "Add product and system_ext partition for emulator"
This reverts commit ef7e3f2623.

The configuration affects GSI to have separate partitions for product
and system_ext which was not intended.

Bug: 138742524
Bug: 138382074
Test: emulator; check boot
Change-Id: Ie621d6b49f22ee2775adf1c1497e812f840f8ba7
2019-08-07 23:44:41 +00:00
Roland Levillain
77507f72fc Merge "Fix typo in error message in tools/fs_config/fs_config_generator.py."
am: c5cb45b7da

Change-Id: I5c1ca3414cc22113864c7ee4ad7d6c2dbc294018
2019-08-07 15:01:23 -07:00
Tao Bao
f0c4aa204c releasetools: Fix the target files diffing.
This CL refactors the non-A/B OTA generation code into a function,
so it allows adding common post-generation code for both flows.

It moves the code for target files diffing to common path, and fixes the
diffing functionality (broken due to the use of unzip pattern).

Test: Run ota_from_target_files with `--log_diff` flag to generate
      non-A/B and A/B OTAs respectively.
Change-Id: I92e5549a58344fc56a151a709c06534913d265d5
2019-08-07 14:53:08 -07:00
Steven Moreland
401a84071b -D__ANDROID_NDK__ for SDK builds.
The NDK is built like this. Having it for app builds within the Android
build system allows us to distinguish platform code from app code.

This is specifically to distinguish AIDL interfaces using libbinder_ndk.
'myBinder-ndk_platform' libs will use additional functionality that
'myBinder-ndk' libs won't use (in the future, these may be separate
variants with the same name, see b/121157555).

Bug: 136027762
Test: using this to distinuish code in NDK vs platform code
Change-Id: I27471b9184e8d67fc51c8eace317f92b3f0f3539
2019-08-07 14:45:03 -07:00
Treehugger Robot
c5cb45b7da Merge "Fix typo in error message in tools/fs_config/fs_config_generator.py." 2019-08-07 21:35:33 +00:00
Tao Bao
f882684d85 Merge "Move make_recovery_path and sparse_img to modules."
am: 4c9527b314

Change-Id: I13a67cfe58450696c37a0e7e4ecc3261d8bd7d5a
2019-08-07 13:15:15 -07:00
Tao Bao
496748378d releasetools: ota_from_target_files uses target_files_diff.
The dependency was overlooked as the module was conditionally imported.

Bug: 63866463
Test: `m -j ota_from_target_files`; Run ota_from_target_files with
      `--log_diff` flag (on a non-A/B target).
Change-Id: I71eff2e55cc28fd649f0ca1b38da53907dac6597
2019-08-07 13:01:27 -07:00
Tao Bao
4c9527b314 Merge "Move make_recovery_path and sparse_img to modules." 2019-08-07 18:49:20 +00:00
Roland Levillain
5ca32dfec5 Fix typo in error message in tools/fs_config/fs_config_generator.py.
Test: n/a
Change-Id: I46682483803e1c7c71fb07157d0ef9c990152d93
2019-08-07 15:51:01 +01:00
Tao Bao
e11a46000c Move make_recovery_path and sparse_img to modules.
These two tools are only used within build system, so not adding them
to otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: Build a non-A/B target that calls make_recovery_patch.
Change-Id: Iaeddc98a2c4a27c6b49d91047500029e460db9e3
2019-08-06 23:27:48 -07:00
Tao Bao
7552bbdfb6 Merge "releasetools: merge_target_files sets verbose in main."
am: 3738f37e22

Change-Id: I0e193d444af6e8a05289e22bbc02fc084972750a
2019-08-06 19:47:51 -07:00
Tao Bao
3738f37e22 Merge "releasetools: merge_target_files sets verbose in main." 2019-08-07 02:19:01 +00:00