Commit Graph

55071 Commits

Author SHA1 Message Date
Tao Bao
74dcbad8f2 Merge "releasetools: Add FORCE_RUN_RELEASETOOLS."
am: 1bc828c97e

Change-Id: I08cd4632611b8053c0457846b0a170488640fb80
2019-08-01 21:33:22 -07: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
58be946140 Merge changes from topic "rm_ONE_SHOT_MAKEFILE"
am: 8b8b9b6bf8

Change-Id: I5764b2ce848710584d2d837e9e33fb9fb71c8d33
2019-08-01 14:31:32 -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
2717256223 Merge "Explicitly add lld's relr relocation flags for Android Pie and above"
am: 8d8e3d6157

Change-Id: Id991caee46ac8647dcfbbef13eb7f3fb16ef5a9d
2019-08-01 13:24:30 -07: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
6e41454ab0 Merge "Add missing aapt2 dep in appcompat-files"
am: f915d9d586

Change-Id: Ib006e27f634945fec6ae73f5e9682dbf43593990
2019-08-01 12:09:12 -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
Mitchell Wills
e2f0f13049 Merge "Add build script to create a self extracting archive with a click through license"
am: 9a1d60f5cb

Change-Id: I412c669ed7291288911f258232519c20fa136f8c
2019-07-31 19:43:27 -07: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
23c41e8d99 Merge "Add Mainline Test Suite (MTS)."
am: d42cabc727

Change-Id: I8d25b44d2da28767e069fef787ce589eef97913c
2019-07-31 18:51:19 -07:00
Chen Zhu
d42cabc727 Merge "Add Mainline Test Suite (MTS)." 2019-08-01 01:20:47 +00:00
Elliott Hughes
9dc7ad724f Merge "Remove PRODUCT_IOT."
am: 3c1bec04e0

Change-Id: I5a8d342ae43c478c164e89be49a1f5660a16a49b
2019-07-31 18:19:15 -07: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
android-build-team Robot
50a835ddb1 Version bump to QP1A.190711.018 [core/build_id.mk]
Change-Id: Iaabb1bbb269721002703e0b9ace5aa6d2fdc4d2c
2019-08-01 00:59:44 +00:00
Elliott Hughes
3c1bec04e0 Merge "Remove PRODUCT_IOT." 2019-08-01 00:32:04 +00:00
android-build-team Robot
da63b57f45 Version bump to QP1A.190711.017 [core/build_id.mk]
Change-Id: Ie16e2bb5c793343d69ecea7f78db70b3df48de21
2019-08-01 00:20:34 +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
Peter Collingbourne
6aea25d1aa Add "arm64-v8a-hwasan" to the supported ABI list in SANITIZE_TARGET=hwaddress builds.
Bug: 132905502
Bug: 133242086
Change-Id: Id4bd6691aa444895878391288d661e5eb43bb4a5
2019-07-31 20:18:46 +00:00
Chris Gross
9300d27562 Merge "Clean-up CL for CL985267."
am: 04bc250d88

Change-Id: I9005b48c374811a207bcf6a0ff0edd50128da380
2019-07-31 09:43:49 -07:00
Chris Gross
04bc250d88 Merge "Clean-up CL for CL985267." 2019-07-31 16:11:23 +00:00
Justin Yun
ed5c7452ec [automerger skipped] Merge "Add product and system_ext partition for emulator"
am: 1c8599376d -s ours
am skip reason: change_id Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2 with SHA1 ff3d62d31d is in history

Change-Id: Ia45f4df586aeea25da5aa2f3b16dd0bae3bf8525
2019-07-31 04:09:28 -07: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
Isaac Chen
7c7387f16f Merge "Add misc_info.txt needed to build super.img"
am: c864fe9054

Change-Id: Icc6760b1c78075401c6bb647022601cba7a22f21
2019-07-30 19:30: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
Justin Yun
ff3d62d31d 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
(cherry picked from commit 28843c3e32)
2019-07-31 00:13:19 +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
93b7c1b547 Merge "Stop supporting wrapping the build with make"
am: d69e849c9b

Change-Id: If6e369f82348d9d7aebe37104072a6878f7281ea
2019-07-30 15:44:36 -07:00
Dan Willemsen
d69e849c9b Merge "Stop supporting wrapping the build with make" 2019-07-30 21:48:52 +00:00
Chris Gross
4cff1f80f2 Merge "Include extra licenses in vendor image NOTICE file"
am: bb039794d6

Change-Id: I1260e92b1cefae5a1c22ae936498157d3b7141d0
2019-07-30 12:34:02 -07:00
Chris Gross
bb039794d6 Merge "Include extra licenses in vendor image NOTICE file" 2019-07-30 19:01:02 +00:00
Dan Willemsen
f02f1f16f0 Merge "Remove the PRODUCT-* goal"
am: a2d19cfd05

Change-Id: I8c83c177104117a88fa9822c48ec7fe45b69365c
2019-07-30 10:34:33 -07: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
Evgeny Eltsin
03290e1b45 Merge "Add native bridge abis to corresponding abilists"
am: 2cd7eaaf13

Change-Id: I4835048b7f912eb4cbf7dc4da2a100805afb1b4b
2019-07-30 05:12:30 -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
3d7a9461e9 Merge "Specify the API level via the triple instead of __ANDROID_API__."
am: 58df13daa0

Change-Id: I5a4388b3b91b1adaef771a4ef608ec708e1adad4
2019-07-29 18:39:23 -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
android-build-team Robot
2bbe78af4f Version bump to QP1A.190711.016 [core/build_id.mk]
Change-Id: Id14f7122245584b66880f5893db119f8d57b9e40
2019-07-30 00:39:32 +00:00
Daniel Norman
3f9554b59a Merge "Adds new merge builds script for use in merging two non-dist builds."
am: a85f0ee8a2

Change-Id: Ib7b66d5ee82df1d9f31d521917490ac1bac4a4e2
2019-07-29 17:36:57 -07:00