Commit Graph

21590 Commits

Author SHA1 Message Date
Yifan Hong
f166825c4c Merge "Change the condition for building super_empty.img." 2019-07-01 20:51:38 +00:00
android-build-team Robot
bc7ee17f8e Make change and version bump to QP1A.190701.001
Change-Id: Ia124310deb4c20e4da047ce30a20d2b73a6985e5
2019-07-01 03:14:52 +00:00
android-build-team Robot
77418dedec Make change and version bump to QP1A.190630.001
Change-Id: I656f018037ab7f73837ce6d2049df9a758b7101a
2019-06-29 23:18:53 +00:00
Kavi Gupta
3ff8608d6f Merge "Modify build to put dumpcoverage agent into /system/lib" am: 4d77e4da45
am: 8532af0f29

Change-Id: If4b5a5dce624e064778f2175a1b153a1e12be98c
2019-06-28 16:17:00 -07:00
Treehugger Robot
4d77e4da45 Merge "Modify build to put dumpcoverage agent into /system/lib" 2019-06-28 22:41:14 +00:00
Tao Bao
48a2feb670 Change the condition for building super_empty.img.
This CL changes the condition for building super_empty.img from
PRODUCT_BUILD_SUPER_PARTITION to PRODUCT_USE_DYNAMIC_PARTITIONS, as a
follow-up to the change in [1].

With the CL in [1], it skips building super.img and super_empty.img both
when turning off PRODUCT_BUILD_SUPER_PARTITION. However, the latter
should be mandatory whenever dynamic partitions is enabled. Because
fastboot relies on this file to properly flash dynamic partitions. Plus,
the cost for building super_empty.img is much lower than the one for
super.img.

As part of the change, it'll write group info into target_files when
building with PRODUCT_BUILD_SUPER_PARTITION == false. It's the work for
target_files merging script to determine the values to be picked up. The
current logic in merge_target_files.py always uses the one from vendor
target_files. This CL adds a testcase to ensure the behavior.

[1] https://android-review.googlesource.com/c/platform/build/+/928756

Bug: 135752763
Test: `m dist` with a target that sets PRODUCT_BUILD_SUPER_PARTITION to
      false. Check the built artifacts contain super_empty.img. Verify
      that the build can be flashed properly.
Change-Id: I277f087eab45663a6c3b33333d16e9e576c1c25c
2019-06-28 14:23:53 -07:00
Steve Muckle
003f35d0d5 Merge "copy kernel modules to ramdisk, add modules.load[.recovery]" am: c1d847e885
am: 2b7a7c7c8f

Change-Id: Icab683e5802f6c18cddd180a1c5bbcd14c9eb268
2019-06-27 16:09:17 -07:00
Tom Cherry
61ca76dc12 Merge "Switch host_init_verifier to getopt()" am: fdbd55d259
am: e7561bc59e

Change-Id: Idc5b4914b4b8e56deecda93a5fbadb629b301be6
2019-06-27 16:04:09 -07:00
Daniel Norman
ce664b0a37 Uses the KNOWN_HIDL_INTERFACES file in host_init_verifier.
This file is used to check that each interface in an init_rc file is a
known hidl_interface.

Test: Adding a misspelling to an init_rc's interface line and observing
build failure.
Bug: 77646540
Change-Id: I30c2dff29679b95085b5c76f6d68e4d794f965e9
2019-06-27 15:54:43 -07:00
Treehugger Robot
c1d847e885 Merge "copy kernel modules to ramdisk, add modules.load[.recovery]" 2019-06-27 21:52:56 +00:00
Mathieu Chartier
73d6c1f7b8 Merge "Revert "Revert "Remove option to create boot image based on preloaded classes""" am: 14c01bea97
am: 92250e43a1

Change-Id: I8c810dfdd8bedd19d1280f5ef719f36cad5e0418
2019-06-27 09:33:21 -07:00
Kavi Gupta
7185f8cc2d Modify build to put dumpcoverage agent into /system/lib
This location allows the agent to be attached to arbitrary processes.

It only makes sense to include libdumpcoverage.so on coverage builds,
as these are the only builds that have any information to be dumped.

Test: manual, used examples in README (see other CL) to test whether
it works on a userdebug_coverage build on cuttlefish

Change-Id: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda
2019-06-27 09:28:39 -07:00
Tom Cherry
f0bc919754 Switch host_init_verifier to getopt()
Test: build, including init script verification, works
Change-Id: Ia786cdf14eb9449ad2d5a6ac9b571c6be709f1e5
2019-06-27 09:21:53 -07:00
Mathieu Chartier
14c01bea97 Merge "Revert "Revert "Remove option to create boot image based on preloaded classes""" 2019-06-27 15:56:52 +00:00
Kiyoung Kim
50cf856b4a Merge "Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is set." am: 6b261101e4
am: ed3c9a9ad6

Change-Id: I96fa27bf51caf484c0301e6a42bdbbcc6b699d20
2019-06-26 23:37:35 -07:00
Kiyoung Kim
6b261101e4 Merge "Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is set." 2019-06-27 05:44:33 +00:00
android-build-team Robot
6d755aa397 Make change and version bump to QP1A.190627.001
Change-Id: Iec04840cb2384887cb3601961ab1e11ea5889b04
2019-06-27 03:15:54 +00:00
Steve Muckle
474e4d04a3 copy kernel modules to ramdisk, add modules.load[.recovery]
Build support exists to copy a set of kernel modules to the recovery,
vendor, and odm images. Extend similar support for copying kernel
modules to the ramdisk via BOARD_RAMDISK_KERNEL_MODULES. If
BOARD_USES_RECOVERY_AS_BOOT, then BOARD_RAMDISK_KERNEL_MODULES is
added to the set of modules to be copied to recovery.

Libmodprobe now supports reading a list of kernel modules to be loaded.
Enable the creation of modules.load and modules.load.recovery files.
These files contain the contents of
BOARD_[RAMDISK|VENDOR|ODM|RECOVERY]_KERNEL_MODULES_LOAD, or if those
variables are not set, the contents of
BOARD_[RAMDISK|VENDOR|ODM|RECOVERY]_KERNEL_MODULES (indicating all
modules should be loaded by default). This allows for
optional customization of the set of modules to be loaded by
libmodprobe and the order they are loaded in.

Bug: 130585369
Change-Id: I9340787d31d71aebc8552344675d9696c189a8a1
2019-06-26 17:16:30 -07:00
Mathieu Chartier
a5828f21f8 Revert "Revert "Remove option to create boot image based on preloaded classes""
Test: make
Test: build/soong/scripts/build-ndk-prebuilts.sh

This reverts commit 7139459ac7.

Change-Id: I7449e57cdcaccc60decca2df929b1b9e920f5904
2019-06-26 14:43:57 -07:00
Colin Cross
670cc43966 Merge "Don't pass --legacy by default to aapt2 compile" am: 1aa3ff6fea
am: 9e0a0d7a2a

Change-Id: I45db8a6ff924cf691071bb8c6de067bc3b791655
2019-06-26 11:35:47 -07:00
Tianjie Xu
4e5591ffb9 Add update_host_simulator to otatools
Therefore, we can access the tool in tradefed test. And partners can also
run simulation without a git repo.

Bug: 131911365
Test: build otatools-package
Change-Id: Ibfeeab360517e129f47f18372bfa236b437bce9b
2019-06-26 10:57:01 -07:00
Mathieu Chartier
a833c93e52 Merge "Revert "Remove option to create boot image based on preloaded classes"" am: 669f3983fd
am: db714424ba

Change-Id: I4d1d4892245f4cfd5f942b6fad7666969e307478
2019-06-26 10:52:50 -07:00
Colin Cross
1aa3ff6fea Merge "Don't pass --legacy by default to aapt2 compile" 2019-06-26 17:05:34 +00:00
Mathieu Chartier
669f3983fd Merge "Revert "Remove option to create boot image based on preloaded classes"" 2019-06-26 16:52:45 +00:00
Mathieu Chartier
d826c86398 Merge "Remove option to create boot image based on preloaded classes" am: 5abcba9f43
am: feae1549d9

Change-Id: Ic950d33cd86133521e8250914d5cf945c86b619b
2019-06-26 09:51:18 -07:00
Mathieu Chartier
7139459ac7 Revert "Remove option to create boot image based on preloaded classes"
This reverts commit 633009b659.

Reason for revert: NDK build broken

Change-Id: I3e470ccf42b6d50c534c53c2b14150506d6226e8
2019-06-26 16:45:01 +00:00
Mathieu Chartier
5abcba9f43 Merge "Remove option to create boot image based on preloaded classes" 2019-06-26 15:56:36 +00:00
Anton Hansson
a4a23641ce Merge "Fix non-existing modules check" am: c1d0bfef47
am: 0796c70deb

Change-Id: Idb48fb89c275747e9997afe37796a0ed74693473
2019-06-26 03:14:49 -07:00
Anton Hansson
c1d0bfef47 Merge "Fix non-existing modules check" 2019-06-26 09:44:30 +00:00
android-build-team Robot
64fefb0689 Make change and version bump to QP1A.190626.001
Change-Id: Ie210cd7239dcd3c4b7b863d3b48f7a78ae82dc0c
2019-06-26 03:15:03 +00:00
Dan Willemsen
e7e39460f5 Merge "Install shared library dependencies for 64-bit windows" am: 7ec8749eb8
am: 59bb6e4ba8

Change-Id: Id5c3f4ba79f9c435229fd5016df48efd863ae1dc
2019-06-25 18:08:54 -07:00
Treehugger Robot
7ec8749eb8 Merge "Install shared library dependencies for 64-bit windows" 2019-06-25 23:57:46 +00:00
Tao Bao
8a746b5689 Merge "Stop passing --block and MKBOOTIMG to ota_from_target_files." am: ac0749ff98
am: 6855138e15

Change-Id: I986ff8caeaba5dbf29df58a6882e68cd9cde1e51
2019-06-25 16:26:38 -07:00
Mathieu Chartier
633009b659 Remove option to create boot image based on preloaded classes
Using the preloaded classes to generate the image is no longer
supported.

Test: make

Change-Id: I63fa47395e9f7ee2967522ae2c02676283fb2d31
2019-06-25 13:52:59 -07:00
Anton Hansson
528fdc021f Fix non-existing modules check
This variable was accidentally changed to refer to the
shorthand PRODUCT_XYZ instead of PRODUCTS.<mk>.PRODUCT_XYZ
in a previous mass-migration, but that shorthand didn't
exist for these variables. Add it in.

Also whitelist the offender introduced since it was broken.

Test: lunch generic; m nothing
Change-Id: I29dd73c29796743e770afa0c2ceb4f8583dc6e1e
2019-06-25 21:52:58 +01:00
Tao Bao
c931547560 Stop passing --block and MKBOOTIMG to ota_from_target_files.
- `--block` has been a no-op since Oreo [1] -- ota_from_target_files
  will always build block-based OTAs or A/B OTAs.
- MKBOOTIMG is no longer needed when calling ota_from_target_files, at
  least for the callsite in Makefile. Because target_files.zip has been
  including boot/recovery images since Lollipop [2].

This CL also switches to long options to improve readability.

[1] commit 457cbf6a8a
[2] commit 3c84f56948

Test: TreeHugger
Change-Id: I801bd0525d2529156bbf783698661d90ba24017a
2019-06-25 13:04:06 -07:00
Dan Willemsen
b88f792d25 Install shared library dependencies for 64-bit windows
Test: m host_cross_libandroidicu_64; see libs in out/host/windows-x86/lib64
Change-Id: Ibf816aeb96e70b70cfcb9b58df9605c3af87db39
2019-06-25 12:56:41 -07:00
Tao Bao
b1b275873c Merge "Clean up the dependencies for user image creation." am: ec53f441fa
am: 8ae72adb4b

Change-Id: Ica87f15572d10b384e13436ec63572922df8de7c
2019-06-25 11:52:02 -07:00
Tao Bao
ec53f441fa Merge "Clean up the dependencies for user image creation." 2019-06-25 17:57:43 +00:00
Isaac Chen
378f856e9c Merge "Add lpunpack to otatools for rebuilding super.img" am: 17a3aa4819
am: 7f338d71d0

Change-Id: Ic91d89e1fafddf7e286a637d2b38db3acfd61248
2019-06-25 10:38:55 -07:00
Isaac Chen
17a3aa4819 Merge "Add lpunpack to otatools for rebuilding super.img" 2019-06-25 17:19:46 +00:00
android-build-team Robot
d6335838a2 Make change and version bump to QP1A.190625.001
Change-Id: I8975cfba285f9844f995f7291d793419fad9b40f
2019-06-25 12:54:12 +00:00
Isaac Chen
eec4a7cba4 Add lpunpack to otatools for rebuilding super.img
lpunpack is needed to repackage super.img for mixed-image virtual devices.
For Cuttlefish, it's included in host package. We need to include it in
otatools.zip so Goldfish or other devices can use it to mix their super images.
Necessary SOs are the same as lpmake and have been included in otatools.zip.

Bug: 134461288
Test: $ lunch aosp_x86-userdebug
      $ m otatools-package
      $ unzip -l $OUT/ota* | grep lpunpack
        467824  2008-01-01 00:00   bin/lpunpack

Change-Id: Ie2092f18afb88721b29b1738847a0b781dbcd431
2019-06-25 11:50:58 +08:00
Tao Bao
1b1c093c74 Merge "Fix an issue in setting up PATH." am: 9392fb3905
am: eb13604f24

Change-Id: I90bc221f6c71196a0995fcd8b41acd4fb32bb66a
2019-06-24 16:32:49 -07:00
Tao Bao
dba635a3b7 Clean up the dependencies for user image creation.
The dependency on MAKE_EXT4FS (mke2fs) has been covered by the rule for
MKEXTUSERIMG (mkuserimg_mke2fs):
https://android.googlesource.com/platform/system/extras/+/refs/heads/master/ext4_utils/Android.bp

The dependency on mksquashfs and img2simg comes from mksquashfsimage.sh,
which has been moved into mksquashfsimage's building rule.

This CL also fixes the ordering of INTERNAL_USERIMAGES_BINARY_PATHS,
which should come after adding all the binaries to
INTERNAL_USERIMAGES_DEPS.

Test: TreeHugger
Change-Id: I8b30bf87860d9711e88eecca4b76db72f5cd8241
2019-06-24 15:47:47 -07:00
Colin Cross
53e64b96ff Merge "Allow passing --legacy in LOCAL_AAPT_FLAGS" am: 4188cc5c5c
am: 20aa21225b

Change-Id: Id861971f30adac718101f7ff3d305299669e5ef5
2019-06-24 14:33:14 -07:00
Tao Bao
cf821fc963 Fix an issue in setting up PATH.
`PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH` will
produce a space separated string due to `foreach`, if
$(INTERNAL_USERIMAGES_BINARY_PATHS) has more than one string. We didn't
hit the issue in the past because $(INTERNAL_USERIMAGES_BINARY_PATHS)
had contained only one path in practice.

Test: TreeHugger
Change-Id: I74ef4356668af63d871a81f6bfd4c9324aa1d956
2019-06-24 14:08:36 -07:00
Treehugger Robot
4188cc5c5c Merge "Allow passing --legacy in LOCAL_AAPT_FLAGS" 2019-06-24 17:13:44 +00:00
Kiyoung Kim
62e2231b82 Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and
BOARD_PREBUILT_BOOTIMAGE is set.

Based on current Makefile INSTALLED_BOOTIMAGE_TARGET always kept as
empty if TARGET_NO_KERNEL is true, so build fails with empty out path.
This change is to set up INSTALLED_BOOTIMAGE_TARGET with
$(PRODUCT_OUT)/boot.img in case of TARGET_NO_KERNEL is true and
BOARD_PREBUILT_BOOTIMAGE is defined.

Bug: 135648566
Test: m -j passed
Change-Id: I9658f215c2e2cc5d87040d5085521ef44722c4ef
2019-06-24 09:45:28 +09:00
android-build-team Robot
7cc400eda9 Make change and version bump to QP1A.190624.001
Change-Id: I72d0b8e1eb6bc3f33c26b4dfe149f252d3740479
2019-06-23 23:17:17 +00:00