Commit graph

1169 commits

Author SHA1 Message Date
Inseob Kim
6e7693f159 Allow BOARD_VNDK_VERSION to be changed
Some devices e.g. cuttlefish include BoardConfigMainlineCommon.mk.
This allows BOARD_VNDK_VERSION to be changed other than current, to
allow mixed build experiment with BOARD_VNDK_VERSION.

Test: try setting BOARD_VNDK_VERSION and get_build_var
Change-Id: I7eb7fe6527f24ee2a3b4af32194a48ca98146a78
2021-02-25 21:22:27 +09:00
Roman Kiryanov
52037cf027 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" 2021-02-24 18:26:30 +00:00
Inseob Kim
6952cb3583 Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"
This reverts commit 05d595194b.

Reason for revert: fixed all goldfish properties

Change-Id: I7b6bf6c4fa94e0d6ba44dbc37b6451291e8fc9ad
2021-02-24 05:27:18 +00:00
Treehugger Robot
32b84909a1 Merge changes from topic "vendor_property_enforce"
* changes:
  Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to productVariables
2021-02-17 07:12:30 +00:00
Bob Badour
0390580262 [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  target/product/sysconfig/Android.bp
  tools/apicheck/Android.bp
  tools/product_config/Android.bp
  tools/releasetools/Android.bp
  tools/signapk/Android.bp
  tools/signtos/Android.bp
  tools/zipalign/Android.bp
  tools/ziptime/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL
    SPDX-license-identifier-MIT legacy_not_a_contribution
    legacy_restricted
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-MIT
to:
  tools/Android.bp
  tools/droiddoc/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
to:
  core/base_rules.mk
  core/dex_preopt_libart.mk
  core/package_internal.mk

Added SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution
to:
  target/board/Android.mk

Added legacy_restricted
to:
  core/tasks/tools/package-modules.mk
  target/product/gsi/Android.bp
  target/product/gsi/Android.mk
  target/product/security/Android.bp
  target/product/security/Android.mk
  tools/acp/Android.bp
  tools/atree/Android.bp
  tools/fs_config/Android.bp
  tools/fs_config/Android.mk
  tools/fs_get_stats/Android.bp
  tools/libhost/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id67a4eb1312940f999643b2ae57f45f34f120724
2021-02-14 10:37:20 -08:00
Inseob Kim
05d595194b Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
device/generic/goldfish/sepolicy/common/property_contexts still contains
violations, so temporarily setting build_broken to relax vendor property
check.

Bug: 176210699
Test: m vendor_property_contexts
Change-Id: Ia7d7830a7e994fd0766fd8854524bb6f9fa5cce6
2021-02-03 18:35:37 +09:00
Martin Stjernholm
4ca749cb11 Merge the module_* device.mk files into their corresponding product mk
files.

To clean up an unnecessary indirection. Instead introduce a common file
for module products.

Test: lunch module_{arm,arm64,x86,x86_64}
      inspect the build banners
Change-Id: Ia312431a664e731f5d801ee2671f62f5cd23bd51
2021-02-02 11:32:25 +00:00
Treehugger Robot
ee7aa0906c Merge "Disable BLE_VND_INCLUDED in GSI" 2021-01-26 09:18:51 +00:00
Nicolas Geoffray
897fe0e8df Split out minimal ART dexpreopt config and use it in mainline builds.
The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.

Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
2021-01-19 17:03:30 +00:00
Anton Hansson
0bafe32068 Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Merged-In: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
(cherry picked from commit c0423c8dae)
2021-01-13 11:05:20 +00:00
Yifan Hong
1ed887f2c3 Merge "Add 5.10-android12-0 KMI for generic_arm64" 2021-01-07 21:23:10 +00:00
Yifan Hong
f57771a299 Add 5.10-android12-0 KMI for generic_arm64
... to build 5.10 GKI APEXes.

Test: TH
Bug: 160995535
Change-Id: I822ac73e8fc23cb957f748d4e6becdc3f7ac9567
2021-01-05 11:51:32 -08:00
Isaac Chen
c311ff6b68 Update GF board variable for dynamic partition
Goldfish specific board variable:

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE

is used to create misc_info.txt, which is needed to mix GSI or CSI on
Goldfish vendor image, and need to reflect the size of the current
super.img, which is now set to 4G+8M (from 3G+8M previously).

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
      super_emulator_dynamic_partitions_group_size=4294967296
Change-Id: Idd0fb302b20780ac97959fabec231a632205d46d
2020-12-25 06:14:43 +00:00
Isaac Chen
3aa08cfa94 Merge "Increase the size of super.img for Goldfish" 2020-12-22 16:56:49 +00:00
Anton Hansson
6d10bf974a Merge "Add mainline_sdk device and product" 2020-12-22 11:40:32 +00:00
Isaac Chen
91a641324c Increase the size of super.img for Goldfish
Current super image for GF is almost full in sdk_gphone_x86_arm
product, and not big enough to include CSI for mixed configuration,
which is a bit bigger than the system image of sdk_gphone_x86_arm.

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
Change-Id: Ia2473231c8490995a10700cbd6e0f82598a5e078
2020-12-22 03:43:26 +00:00
Anton Hansson
82996e4bbc Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 18:59:40 +00:00
Anton Hansson
f68f92d3d5 Add mainline_sdk device and product
This device/product is suitable for a soong-only build that builds for
all the architectures needed for mainline modules sdk prebuilts.

Bug: 174315599
Test: TARGET_PRODUCT=mainline_sdk soong_ui --make-mode --skip-kati;
      (inspect soong.variables)
Change-Id: I3ab5d3611e25a666de39752dedaddbf32ddf6df7
2020-12-15 12:48:37 +00:00
Tianjie Xu
7d958f4fd0 Merge "Use sha256 to build the hashtree in avb image" 2020-12-11 20:56:05 +00:00
Tianjie
055128bf10 Use sha256 to build the hashtree in avb image
The hashtree is used in verified boot, and sha256 is more robust against
malicious attacks. Also, sha256 uses the same space as sha1 in the
hashtree. And there isn't much performance regression per
https://b.corp.google.com/issues/156162446#comment18

By putting the config in BoardConfigMainlineCommon.mk, we enable sha256
on all Pixels. And devices who want to use a different hash algorithm
can override it in it's own board configs.

Bug: 156162446
Test: boot the device and check performance
Change-Id: I9f1d3bcf241bc65adf10376cc5ae7ab1986216fa
2020-12-11 01:26:12 +00:00
Will McVicker
55cd0ee523 Update aosp_arm64 kernel 4.19 prebuilt name
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
Merged-In: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
2020-12-10 18:47:03 +00:00
Anton Hansson
63d3835f4a Merge changes Ib2a4a208,Ic8235912
* changes:
  Set allow list for generic ramdisk
  Add a "relaxed" mode for require-artifacts-in-path
2020-12-10 12:20:26 +00:00
Lingfeng Yang
d5f89b11e6 Merge "emulator_arm64: Don't support AArch32" 2020-12-09 17:47:33 +00:00
Yifan Hong
e51c7e8aef Set allow list for generic ramdisk
Devices that uses generic ramdisk must inherit from generic_ramdisk.mk.
This makefile ensures that only a set of files can be installed to the
ramdisk. Other files must be installed to the vendor-ramdisk.

Let aosp_arm64 use this makefile.

Fixes: 173742069
Test: manual
Change-Id: Ib2a4a208deaf2f4d707bec256207b4b8479a601a
(cherry picked from commit bc9608c4c3f3cd0ac3f29863209c80fcfe4e2f7f)
2020-12-09 16:31:25 +00:00
Lingfeng Yang
9b6de576dc emulator_arm64: Don't support AArch32
This is needed for the emulator to run on Apple Silicon.

In addition, we're going to move to 64-bit only soon across the platform
so it makes more sense to go with 64-bit-only going forward here.

Change-Id: I0d9d189cd0b7a07d6c315e8c0f99c7b4766b4bde
2020-12-08 00:26:06 +00:00
Yifan Hong
1482fba34f Remove e2fsck from generic ramdisk.
On devices using the generic ramdisk / GKI,
e2fsck is moved to vendor ramdisk now.

Fixes: 173425293
Test: build and manual inspect.
Change-Id: I27562a875ca33a1b6dd3dcf862232fd4dfef6564
2020-12-04 15:28:57 -08:00
Treehugger Robot
68f59362f4 Merge "aosp_arm64: clarify GKI in readme." 2020-11-17 00:46:41 +00:00
Yifan Hong
d440184471 aosp_arm64: clarify GKI in readme.
Test: none
Change-Id: Id24912a67c8700f3c68dfa924ab7b85246c7fcb0
2020-11-16 11:40:58 -08:00
Jeff Vander Stoep
f5dd057095 OWNERS: include core sepolicy OWNERS
Simplify OWNERS by referencing a centralized list.

Test: n/a
Change-Id: Ibbdb8b217e387bdc66069e91d034a933ca9fa2b0
2020-11-16 13:26:38 +01:00
Yifan Hong
49968aa137 aosp_arm64 Copy boot image from $OUT to target files
If BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES is defined,
in target files, instead of rebuilding the boot image, copy the boot
image already built in $OUT to target files package directly so that
they are the same package.

Define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES for aosp_arm64.

The GKI APEX is built using the boot image in $OUT. If the boot image in
$OUT is different from the boot image in target files, aka the generic
boot image we release, the GKI APEX we built is invalid.

If another device needs to copy $OUT/boot.img to target files, it can
define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES.

Fixes: 172682114
Test: lunch aosp_arm64 &&
Change-Id: I10fc7a5aa36e976dbeaf25434239687455bba061
2020-11-10 12:55:40 -08:00
Yifan Hong
97c8455634 Merge "Install e2fsck_ramdisk to GKI ramdisk." 2020-11-06 19:17:15 +00:00
Yifan Hong
84ae75cd3c Install e2fsck_ramdisk to GKI ramdisk.
Test: build and inspect output
Bug: 172603832
Fixes: 171326057
Change-Id: If656efdea8a503dc837f23898a5f0ed56884eda4
2020-11-06 10:28:03 -08:00
Treehugger Robot
a0aebc1081 Merge "Phase out Legacy GSI" 2020-11-06 04:00:40 +00:00
Treehugger Robot
d41b82563f Merge "Switch ramdisk.img to the LZ4 format" 2020-11-05 21:30:28 +00:00
Roman Kiryanov
49803e35b9 Switch ramdisk.img to the LZ4 format
Bug: 169336853
Test: file out/target/product/emulator_x86_64/ramdisk.img
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I085d230a49cd92cc7fe3a620eec411d0e8b90667
2020-11-05 10:47:55 -08:00
SzuWei Lin
d418471390 Phase out Legacy GSI
Legacy GSI is the GSI for the O/O-MR1 launching devices. VINTF and
VNDK do not support O/O-MR1 now. It is the time to phase out Legacy
GSI.

Bug: 162277261
Test: none
Change-Id: I55901604da21daa58b51ee6676cd61bb9e4ff5e6
2020-11-03 18:23:57 +08:00
Yifan Hong
c10e367912 Enable BOARD_USES_GKI on aosp_arm64
Enable BOARD_USES_GENERIC_KERNEL_IMAGE := true. In addition:
- Disable recovery_as_boot
- Disable recovery (PRODUCT_BUILD_RECOVERY_IMAGE=false)

Test: builds, and mmma packages/modules/Gki
Bug: 156098440
Change-Id: If6988f6b44f098ed8f1dc214eee1f2223fd03ae8
2020-11-02 11:28:20 -08:00
Daniel Norman
ad6293c098 Removes usage of TARGET_NO_VENDOR_BOOT.
- true -> PRODUCT_BUILD_VENDOR_BOOT_IMAGE=false
- false -> (removed, uses default option which builds vendor-boot.img
            if BOARD_BOOT_HEADER_VERSION>=3)

Bug: 170423509
Test: Inspect build artifacts from treehugger.
Change-Id: Id16fbda7fdfc70d62db389d6efb5201cb0d6d4e3
2020-10-16 15:10:21 -07:00
Steve Muckle
0f0fa1a07d Revert^2 "use new GKI kernel location"
a0281768fe

This revert includes a fix to use the lz4 variant of the kernel,
as was the case before, rather than the uncompressed one.

Bug: 170451791
Change-Id: Iaab082d8bba04df82d742d682251447f3e21fe9b
2020-10-09 10:32:57 -07:00
Xiao Ma
a0281768fe Revert "use new GKI kernel location"
Revert "Update kernel to builds 6888926"

Revert submission 1454075-2020-10-07-gki-update

Reason for revert: Looks like this topic changes caused daily build broken, the error log as:

error: +out/target/product/emulator_arm64/boot.img too large (34934784 > 33484800)

I tried to revert this topic first and then feel free to revert revert it.

Reverted Changes:
Ie74ca26e8:use new GKI kernel location
Ibff0d9638:Update kernel to builds 6889747
I693476e82:Update kernel to builds 6888926
I35d7f320c:Update kernel to builds 6888926
Id221a7a30:Update kernel to builds 6888926
I4421dbf67:remove kernel, kernel modules from cuttlefish_kern...
I991f9a6af:Allow downstream devices to customize vendor modul...
I598630e09:load kernel, kernel modules from updated locations...

Bug: 170451791
Change-Id: I4d8f18a7c80eb92cb475c48e1dcf04ceabd08984
2020-10-09 07:22:45 +00:00
Steve Muckle
4f10706721 use new GKI kernel location
The GKI kernel is now stored in kernel/prebuilts.

Bug: 161563956
Change-Id: Ie74ca26e8e9bf05c824eb87e03eeda865d861dde
2020-10-08 20:25:49 +00:00
Dan Shi
82c4cb74c6 Remove build tasks for vts10
Bug: 169581727
Test: build
Change-Id: I865553ae07bc6eac3b90f87a494537102c398280
2020-10-05 10:17:21 -07:00
Sam Lin
7c9f562d00 Add an aosp target that supports 64-bit app only
Bug: 168796046
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
Merged-In: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-21 17:44:46 +00:00
Treehugger Robot
6651152c08 Merge "Disable sparse image for GSI products" 2020-09-11 08:17:49 +00:00
Yo Chiang
90339f9563 Disable sparse image for GSI products
There are a couple of use cases where we don't want sparse image:
1. `DynamicSystemInstallationService` in Q framework doesn't support
   sparse images.
2. Super image manipulation tools (like `lpadd`) doesn't play nice with
   sparse images.

Force non-sparse GSI so we don't break backwards compatibility (1) and
we don't need to write `simg2img` everywhere (2).

Bug: 167695592
Test: Prepare a device flashed with Q framework
Test: Build system.img and create system.img.zip; the image is non-sparsed
Test: m tradefed-all && \
  tradefed.sh run commandAndExit template/atest_local_min \
  --template:map preparers=template/preparers/dsu-preparer \
  --extra-file system-img.zip=out/.../system.img.zip \
  --dynamic-system-update:disable-tear-down
Change-Id: Ib7667165ce53e87eb86bc7d3f56c80a418123a62
2020-09-08 16:55:43 +08:00
Xin Li
c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Yifan Hong
e5ab7a241b Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64
Test: m com.android.gki.boot-5.4_5.4-android12-0
Bug: 162888350
Change-Id: I8ac387cc52e498c2790c0b84e866a307fdd1ae8b
2020-08-24 12:23:27 -07:00
Steve Muckle
2f17246fe7 enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-08-20 10:17:37 -07:00
Steve Muckle
2ad32ef3af add kernels with untrimmed symbols to aosp_arm64
For development and debugging it is useful to have boot images with all
kernel symbols exported.

Bug: 163613927
Change-Id: I6118e5f0fff6e9cbc20ecca6bd362a26a79544b1
2020-08-17 15:16:30 -07:00
SzuWei Lin
33157a2da8 Disable BLE_VND_INCLUDED in GSI
Not all devices support BLE_VND_INCLUDED. Disable BLE_VND_INCLUDED
in GSI before it becoming a runtime enabled feature.

Bug: 146149698
Bug: 160930886
Test: build aosp_arm64-userdebug, check the feature manually
Change-Id: I17fd2c1c3cdb87fde11362683d4a7bec1d989b6f
2020-08-13 15:40:31 +08:00