Commit graph

50869 commits

Author SHA1 Message Date
Treehugger Robot
554245e73c Merge "Support m dist updatepackage" 2019-08-06 03:46:34 +00:00
Treehugger Robot
169b1cb897 Merge "VTS: Create vts-core suite and packaging rules" 2019-08-06 02:21:41 +00:00
Dan Willemsen
9ae6495d91 Support m dist updatepackage
If you want the `dist` behavior, but only want to build the
updatepackage (you only need to be able to flash the device).

Test: m dist updatepackage
Change-Id: I921f9d96ab3f7df180601dac3fff2ff24185792d
2019-08-05 14:45:11 -07:00
Dan Willemsen
6240872250 Merge "Remove import_includes/export_includes" 2019-08-05 17:28:18 +00:00
Daniel Norman
477d2894e4 Merge "Adds support for optionally generating vbmeta.img in merge_builds." 2019-08-02 23:00:46 +00:00
Daniel Norman
276f06275b Adds support for optionally generating vbmeta.img in merge_builds.
Bug: 137853921
Bug: 138671115
Test: python -m unittest test_common
Test: python -m unittest test_add_img_to_target_files
Test: Ran 'merge_builds --build_vbmeta' for two devices, one with the
vbmeta struct on system.img and another with vbmeta_system.img. Flashed
the regenerated vbmeta.img files on devices, devices boot.

Change-Id: I8d7585c7af468be3d242d8aceeed6d27e6fc6d96
2019-08-02 20:13:03 +00:00
Treehugger Robot
c016c281c1 Merge "Handle zygote_32_64 in gsi_release.mk" 2019-08-02 08:19:33 +00:00
Tao Bao
1bc828c97e Merge "releasetools: Add FORCE_RUN_RELEASETOOLS." 2019-08-02 03:57:39 +00:00
Dan Willemsen
18ffd5891e Remove import_includes/export_includes
Now that ONE_SHOT_MAKEFILE no longer exists, we don't have to rely on
the filesystem to store this informtion.

This removes ~16.7k files from our build graph
(aosp-master/aosp_arm64-eng), though only about 600 of them were being
used in a normal build.

Test: treehugger
Change-Id: I3ac12f5ea7f11d25064109a0599bc5be1976fba5
2019-08-01 14:56:45 -07:00
Dan Willemsen
8b8b9b6bf8 Merge changes from topic "rm_ONE_SHOT_MAKEFILE"
* changes:
  Remove [jni_]link_type files
  Remove support for ONE_SHOT_MAKEFILE
2019-08-01 21:11:02 +00:00
Pirama Arumuga Nainar
8d8e3d6157 Merge "Explicitly add lld's relr relocation flags for Android Pie and above" 2019-08-01 19:54:11 +00:00
Tao Bao
7d223c6ddd releasetools: Add FORCE_RUN_RELEASETOOLS.
This allows test runner to take care of the external tools setup, then
to start the test without a lunch'd environment. This is needed before
having supports like python_test_helper that packs dependents into
releasetools_test module.

Bug: 138791766
Test: Don't lunch any target. Use `FORCE_RUN_RELEASETOOLS=1 python -m
      unittest -v test_add_img_to_target_files` and check there's no
      skipped testcases.
Change-Id: Iafeaba54fc228d8e1fc5ff3c91f7ffebef18ad7f
2019-08-01 12:22:54 -07:00
Dan Willemsen
f915d9d586 Merge "Add missing aapt2 dep in appcompat-files" 2019-08-01 18:22:23 +00:00
Luca Stefani
a239c67ed3 Add missing aapt2 dep in appcompat-files
* When soong_app_prebuilt calls appcompat-header
  with appcompat enabled aapt2 was missing

Test: m SystemUI
Change-Id: I26bcb507f68902ff95a1045dfeb22dd8d4913a92
2019-08-01 16:29:06 +02:00
SzuWei Lin
bcd7741e81 Handle zygote_32_64 in gsi_release.mk
64 bits GSI expects supporting both zygote_64_32 and zygote_32_64.

The patch adds including init.zygote32_64.rc in gsi_release.mk
direclty, and also revises all GSI releasing build targets.

Bug: 138625977
Test: build aosp_arm64-userdebug and has init.zygote32_64.rc
Test: build aosp_arm-userdebug and no init.zygote32_64.rc
Change-Id: Ia61db1315321798bae8902b35ddaa5e5f3e7dd3e
2019-08-01 11:57:18 +08:00
Treehugger Robot
9a1d60f5cb Merge "Add build script to create a self extracting archive with a click through license" 2019-08-01 02:17:33 +00:00
Chen Zhu
d42cabc727 Merge "Add Mainline Test Suite (MTS)." 2019-08-01 01:20:47 +00:00
Dan Willemsen
0df0f6bbf1 Remove [jni_]link_type files
Now that mm/ONE_SHOT_MAKEFILE have been removed, we can expect to know
about all of our dependencies at the end of the build.

This removes 19k nodes from our build graph (aosp-master
aosp_arm64-eng), though in a default build, only 3k of those are used.

Test: ALLOW_MISSING_DEPENDENCIES=true, then trigger a missing dependency
Test: treehugger
Test: create link_type files, then apply CleanSpec.mk, ensure they're removed
Change-Id: I9506331e4a9911d2f26e59a2f72a97aef1644073
2019-07-31 18:09:22 -07:00
Dan Willemsen
5c3fc2a792 Remove support for ONE_SHOT_MAKEFILE
Test: treehugger
Change-Id: Ie73418c186ec4c0e1c91078c133de8f8113295bf
2019-07-31 18:08:47 -07:00
Elliott Hughes
3c1bec04e0 Merge "Remove PRODUCT_IOT." 2019-08-01 00:32:04 +00:00
Chen Zhu
95b0913070 Add Mainline Test Suite (MTS).
Test: m mts && mts-tradefed run mts

Bug:123411735
Bug:126277867

Merged-In: Iba6bf89bd4457ed0f5c1eb3351bf5ffd6720441d
Change-Id: I889ace72980619884cb35359b9a18d7b2053fed8
2019-07-31 21:31:10 +00:00
Chris Gross
04bc250d88 Merge "Clean-up CL for CL985267." 2019-07-31 16:11:23 +00:00
Treehugger Robot
1c8599376d Merge "Add product and system_ext partition for emulator" 2019-07-31 10:46:39 +00:00
Justin Yun
ef7e3f2623 Add product and system_ext partition for emulator
Build product and system_ext image and add them to super partition.

Bug: 138382074
Test: boot emulator and check system_ext partition mounted
Change-Id: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
Merged-In: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
2019-07-31 10:45:55 +00:00
Pirama Arumuga Nainar
bf2af95f73 Explicitly add lld's relr relocation flags for Android Pie and above
Bug: http://b/119086751

https://android-review.googlesource.com/c/837025 disabled lld relocation
packing globally and enabled it for soong modules targeting pie and
above.  Turn it on for Android.mk modules as well.

Test: grep for -Wl,pack-dyn-relocs=android in
      out/build-aosp_<device>.ninja

Change-Id: I81b8625073aa6b364219b8cf3122b69c95ec7589
2019-07-30 22:36:29 -07:00
nelsonli
3d51ac07ef VTS: Create vts-core suite and packaging rules
For migrating most existing VTS test to executable by Base TradeFed, we have to
create vts-core suite and test all of the modules in vts-core first.
And add the packaging rules for vts-core suite.

Bug: 137921421
Test: (1) add test_suites: ["vts-core"], to any module or patch aosp/1089570
      (2) $ m vts-core
      (3) check this module in the vts-core.zip

Change-Id: I7a52b3ee400f58e6c383638396ced7194d6bc65d
2019-07-31 10:10:29 +08:00
Isaac Chen
c864fe9054 Merge "Add misc_info.txt needed to build super.img" 2019-07-31 01:56:35 +00:00
Chris Gross
e5d4a9e7ff Clean-up CL for CL985267.
CL985267 was merged with one comment left unresolved. This CL resolves
that comment.

Test: Built with a pre-built vendor image and ensured additional
licenses were placed in NOTICE.xml
Test: Built with a vendor image and ensured additional licenses were
placed into NOTICE_VENDOR.xml

Change-Id: I927f09b4b501c38447702ee2fd8fdbdd5934ad20
2019-07-30 16:06:29 -07:00
Dan Willemsen
d69e849c9b Merge "Stop supporting wrapping the build with make" 2019-07-30 21:48:52 +00:00
Chris Gross
bb039794d6 Merge "Include extra licenses in vendor image NOTICE file" 2019-07-30 19:01:02 +00:00
Dan Willemsen
a2d19cfd05 Merge "Remove the PRODUCT-* goal" 2019-07-30 17:04:07 +00:00
Elliott Hughes
0548439172 Remove PRODUCT_IOT.
Test: treehugger
Change-Id: Ic214ebda6c65e7e51e39151b10f4ce965b35c121
2019-07-30 09:01:15 -07:00
Isaac Chen
3a8cc17654 Add misc_info.txt needed to build super.img
Previously, misc_info.txt is included only when super.img is included
in the update package. This CL adds it to the update package so
Goldfish-based products for emulator can use it to create a new super.img
later in TF pipeline so mixed-image tests can be performed.

A typical example for such mixed-image tests is GSI (aosp_x86) on
sdk_gphone_x86 or older aosp_x86 vendor images.

Bug: 138545354
Test: $ lunch aosp_x86-userdebug; m - j
      $ unzip -l $OUT/aosp*.zip | grep misc
      526  2019-07-22 14:50   misc_info.txt

Change-Id: I111716f499b031c03f2896299b7436a7611841b8
2019-07-30 19:40:56 +08:00
Evgeny Eltsin
2cd7eaaf13 Merge "Add native bridge abis to corresponding abilists" 2019-07-30 11:36:27 +00:00
Dan Willemsen
893948955d Stop supporting wrapping the build with make
The build servers are no longer using this. It's hard to search for
others using it -- I've cleaned them up as I've run across them, but
we'll just have to see who breaks once this goes in.

This was the last user of makeparallel, so we can remove it.

Test: make
Test: treehugger
Change-Id: If6df3f1a67d6a6df36afaa4b07cd88a48a364fe1
2019-07-29 22:43:35 -07:00
Peter Collingbourne
58df13daa0 Merge "Specify the API level via the triple instead of __ANDROID_API__." 2019-07-30 01:23:04 +00:00
Treehugger Robot
a85f0ee8a2 Merge "Adds new merge builds script for use in merging two non-dist builds." 2019-07-29 23:45:41 +00:00
Dan Willemsen
8a5d597bbf Remove the PRODUCT-* goal
I've switched all the build server configs to using TARGET_PRODUCT /
TARGET_BUILD_VARIANT and explicit goals instead.

Remove tools/check_builds.sh which relied on this, but hasn't been
touched in a long time.

Test: m PRODUCT-test
Test: treehugger
Change-Id: If5f8c714567b33aeb38223c176ca24ea649eb57d
2019-07-29 14:27:04 -07:00
Mitchell Wills
1c790ca655 Add build script to create a self extracting archive with a click through license
Bug: 130257221
Test: generated an archive using the script and ran the result
Change-Id: If1147cd41fa939b0d9958196e627042b5731dc14
2019-07-29 11:04:57 -07:00
Daniel Norman
bfc51efa97 Adds new merge builds script for use in merging two non-dist builds.
Bug: 137853921
Test: python -m unittest test_common
Test: python -m unittest test_merge_target_files
Test: Built two partial builds without dist. Ran out/host/linux-x86/bin/merge_builds.
Flashed using `fastboot flashall`. Device boots.
Change-Id: Iffd0a447cdf19a7775a813b4b896178aa6f861f3
2019-07-29 16:30:56 +00:00
Treehugger Robot
6f8e3da035 Merge "Remove the APP-* goal" 2019-07-29 16:30:52 +00:00
Evgeny Eltsin
28fbe7f9e9 Add native bridge abis to corresponding abilists
This uses TARGET_NATIVE_BRIDGE_*_ABI variable to automatically generate
abi lists.

Sample properties for x86+arm:
ro.product.cpu.abilist=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist32=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist64=

Sample properties for x86_64+arm64:
ro.product.cpu.abilist=x86_64,x86,arm64-v8a,armeabi-v7a,armeabi
ro.product.cpu.abilist32=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist64=x86_64,arm64-v8a

Bug: http://b/77159578
Bug: http://b/28684022
Test: make cf_x86_64_phone, deploys, check adb shell getprop | grep abi
Change-Id: I42a73f5c627b9d9f44e31cc5ad84238e1050f52a
2019-07-29 16:23:32 +02:00
Tao Bao
98efd8290e Merge "releasetools: Move recovery-two-step.img to OTA/." 2019-07-28 17:57:06 +00:00
Tao Bao
0480850f0b releasetools: Move recovery-two-step.img to OTA/.
It used to be packed at IMAGES/recovery-two-step.img, but to serve OTA
purpose only.

Test: `m dist` with a non-A/B target. Check the file in the generated
      target_files.zip.
Test: Create two-step package. Check that recovery-two-step.img is used.
Change-Id: Iec6a73c682e0f844cd8c0b758c9470fa35dd15d8
2019-07-26 13:59:11 -07:00
Treehugger Robot
5da40edef0 Merge "fix: set built_module in misc_prebuilt_internal.mk" 2019-07-26 01:22:23 +00:00
Dan Willemsen
01ab167a20 Remove the APP-* goal
I can't find anything still using this, and I'm close to removing the
PRODUCT-* goal.

Test: codesearch (both android and the build configs)
Test: m APP-test
Change-Id: I4efdcdea2bb9ace14632cab35a2a1c7bdc89592f
2019-07-25 17:59:07 -07:00
Peter Collingbourne
e3606ae651 Specify the API level via the triple instead of __ANDROID_API__.
Clang derives the value of __ANDROID_API__ from the triple these days. In a
future version of clang I plan to start making the behaviour of the HWASAN pass
dependent on the API level in the triple, so it's going to need to be accurate.

Test: walleye-userdebug boots
Change-Id: I23f570bd8ee4fb3167729a75a5e859efe1883a46
2019-07-25 17:43:04 -07:00
Chris Gross
aad39b3281 Include extra licenses in vendor image NOTICE file
If building with a vendor image, ensure that the licenses from
extra partitions are included in the vendor NOTICE file (possibly in
addition to having them in the system NOTICE file) since they could come
from disperate source trees. This change does not affect existing NOTICE
files outside of the system partition. (e.g. product and system_ext).

Bug: 134679603
Test: Built a vendor image enabled target and ensured the notices were in the
proper file
Change-Id: Ib17c7d7f84805734de09e686a4835b9b680b4192
2019-07-25 16:10:05 -07:00
Treehugger Robot
6b466c8f56 Merge "releasetools: Fix the use of StringIO." 2019-07-25 16:33:02 +00:00
Treehugger Robot
cfbf9d32f6 Merge "Add libraries txt file to build target" 2019-07-25 10:29:39 +00:00