Commit Graph

58266 Commits

Author SHA1 Message Date
Roman Kiryanov 6e0c857fe2 Import the d/g/goldfish soong namespace for libwifi-hal-emu
Some devices refer to libwifi-hal-emu via

BOARD_WLAN_DEVICE := emulator

we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.

Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
Merged-In: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
2020-05-18 09:46:25 -07:00
Yo Chiang ca6e50fa2c Merge "Access ALL_MODULES subvars with my_register_name" 2020-05-18 03:41:23 +00:00
Treehugger Robot 203fd77042 Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" 2020-05-18 01:50:49 +00:00
Treehugger Robot 3528db55f3 Merge "Remove /default.prop" 2020-05-16 08:39:56 +00:00
Treehugger Robot ff58fe4874 Merge "vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args" 2020-05-16 00:17:20 +00:00
Jaewoong Jung 8140bb1dc7 Merge "Implement android_app_set module." 2020-05-15 12:13:43 +00:00
Treehugger Robot 642343975e Merge "Don't check link type of Soong app JNI libraries" 2020-05-15 07:17:42 +00:00
easoncylee 9425870f73 Update auto-gen test config template with PARAMETERIZED_STRINGS
placeholder

Bug: 134509111
Test: add "test_mainline_modules: [some.apk]" to TetheringTests,
and build the modules, confirm the parameterized option is added
in the test config.

Change-Id: I0f4f837412075520153d21c9ca12cf5c3f555de7
2020-05-15 11:43:43 +08:00
Treehugger Robot 4e0bce688c Merge changes from topic "remove_default_prop"
* changes:
  Remove /system/etc/prop.default
  Remove /vendor/default.prop
2020-05-15 02:12:49 +00:00
Sasha Smundak b30ff0a65b Implement android_app_set module.
Bug: 152319766
Test: manual and builtin
Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-14 19:06:28 -07:00
Treehugger Robot f774ae9aa0 Merge "Fix _ImportParser() error if property is imported from oem partition." 2020-05-15 00:39:52 +00:00
Colin Cross 1c8d81e5d9 Don't check link type of Soong app JNI libraries
Link type checking is already done within Soong, and
SOONG_SDK_VARIANT_MODULES is not complete yet while parsing Soong
modules, skip JNI link type checking for Soong apps.

Bug: 156225490
Test: m checkbuild
Change-Id: I2f6824b180ccdd62c26497bdca527540ca22f0d7
2020-05-14 12:50:52 -07:00
Hongguang Chen b4702b7006 Fix _ImportParser() error if property is imported from oem partition.
The oem partition allows system build.prop to import properties from it
by "import /oem/oem.prop xxxx". An _ImportParser() error was raised on
this case.

BUG: 154171021
Test: 1) "atest --host releasetools_test releasetools_py3_test -c"
      2) On a device who has oem partition, "make dist" and sign its
      target zip file.
Change-Id: I47875bf7a698390e11690150e6516a3064550ca0
2020-05-14 17:44:14 +00:00
Paul Duffin 29beb858ef Merge "Revert "support different boot partition sizes in aosp_arm64"" 2020-05-14 09:23:49 +00:00
Paul Duffin b5a334d0b3 Revert "support different boot partition sizes in aosp_arm64"
This reverts commit 11c4bcf406.

Reason for revert: Broke build b/156569314

Bug: 156569314
Change-Id: I384740320acf48d09b0544e45b5a13ff0a6a163d
2020-05-14 08:40:52 +00:00
Jiyong Park c47b4ee74b Remove /default.prop
It was kept for non-Treble devices, but now /system/build.prop is used
instead by having both system-configured sysprops and vendor-configured
sysprops. To summarize:

* For Treble compliant devices
- /system/build.prop has
  ADDITIONAL_DEFAULT_PROPERTIES
  PRODUCT_SYSTEM_DEFAULT_PROPERTIES
  props generated from buildinfo_common.sh
  props generated from buildinfo.sh
  props read from TARGET_SYSTEM_PROP file
  ADDITIONAL_BUILD_PROPERTIES

- /vendor/build.prop has
  PRODUCT_DEFAULT_PROPERTY_OVERRIDES
  props generated from buildinfo_common.sh
  props read from TARGET_VENDOR_PROP
  PRODUCT_PROPERTY_OVERRIDES

* For non-Treble devices,
PRODUCT_DEFAULT_PROPERTY_OVERRIDES moves from /vendor/build.prop to
/system/build.prop (just after PRODUCT_SYSTEM_DEFAULT_PROPERTIES).

Other props in /vendor/build.prop remain there but they are not used
because it's a symlink for /system/vendor/build.prop and init does not
follow symlink. Especially, PRODUCT_PROPERTY_OVERRIDES is ignored.
Someone might think this as a bug, which actually is, but this change
doesn't attempt to fix that, because 1) that's out of scope of this
change, and 2) we will anyway merge PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES into one.

Bug: 117892318
Test: TH passes

Change-Id: I867f3615ef8c06650ab2ee96642bac4f6d8ca820
2020-05-14 16:46:26 +09:00
Jiyong Park 09153e244e Remove /system/etc/prop.default
Contents that were in /system/etc/prop.default are now in
/system/build.prop.

The content is placed at the top of build.prop to keep the existing
order between the two files.

Caveat: /prop.default still remains for non-Treble devices.

Bug: 117892318
Test: TH passes
Test: inspect  /system/build.prop and check if it has contents from
the old /system/etc/prop.default file

Change-Id: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
2020-05-14 16:28:19 +09:00
Jiyong Park b894d4bb68 Remove /vendor/default.prop
Contents that were in /vendor/default.prop are now in /vendor/build.prop

The content is placed at the top of build.prop to keep the existing
order between default.prop and builld.prop.

Bug: 117892318
Test: TH passes
Test: inspect  /vendor/build.prop and check if it has contents from
the old /vendor/default.prop file

Change-Id: Ifa1f1dca3b4f4a5fa87d26b8ee058ee706dc54bb
2020-05-14 16:19:32 +09:00
Treehugger Robot ade028ea9e Merge "support different boot partition sizes in aosp_arm64" 2020-05-14 07:05:31 +00:00
Yo Chiang 5814247ed2 Access ALL_MODULES subvars with my_register_name
ALL_MODULES and subvars are registered with my_register_name.
Replace references of ALL_MODULES.$(LOCAL_MODULE).* with
ALL_MODULES.$(my_register_name).*.

Bug: 155869107
Test: TH presubmit build pass
Test: TH presubmit build noop
Change-Id: I1481c341a285dc04de86619abec3194bb92c9739
2020-05-14 04:08:42 +00:00
Tianjie Xu 7a3cf2c4ba Merge "Exclude vendor_boot in secondary payload" 2020-05-14 02:34:44 +00:00
Tianjie c385064d94 Exclude vendor_boot in secondary payload
The secondary payload is used by factory OTA to speed up the first
boot of the device. The payload should only contain bootloaders
images and the precompiled apps in system_other. Remove vendor_boot
to reduce the secondary payload size.

Test: build a package with secondary payload
Change-Id: I3a9f6dda00a5aac038438065e2bc6483d71b5e95
2020-05-13 14:47:31 -07:00
Steve Muckle 70ef6fd4f2 Merge "Enables signing for generic boot images" 2020-05-13 19:36:56 +00:00
Steve Muckle 11c4bcf406 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

Bug: 156036850
Bug: 155049180
Change-Id: I73b70a4d52c2662c3015899632bb8a2b424108d5
2020-05-12 16:51:45 -07:00
Tianjie Xu e9ab85956f Merge "Reland "Calculate the runtime fingerprint prefixes from build prop"" 2020-05-12 18:51:25 +00:00
Tianjie Xu 49b45296f6 Merge "Reland "Add a wrapper class PartitionBuildProp""" 2020-05-11 21:30:09 +00:00
Treehugger Robot f4a9f159aa Merge "Update Keymaster AIDL to V2 in VNDK list" 2020-05-11 17:28:43 +00:00
Inseob Kim b2daf711a3 Merge "DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2020-05-11 09:53:21 +00:00
cfig 125efba2bf
vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args
'os_version' and 'os_patch_level' are not defined in vendor boot image header,
so remove INTERNAL_MKBOOTIMG_VERSION_ARGS to avoid confusion

Test: lunch aosp_cf_x86_64_phone-userdebug; m vendorbootimage

Change-Id: I19c82846c9669bbd5475605e8b2457744040390d
2020-05-11 15:01:53 +08:00
Yo Chiang 6190f6910f Merge "Ban ELF prebuilts in PRODUCT_COPY_FILES" 2020-05-11 05:14:29 +00:00
Tianjie Xu 9afb221c9e Reland "Calculate the runtime fingerprint prefixes from build prop"
This reverts commit b21e48b499.

In practice, some partners use the 'import' statement to override
the device fingerprint at runtime. The runtime fingerprint will
later add to the metadata of OTA package, so that the OTA server
can deliver the package to corresponding devices correctly.

This CL supports parsing a subset of import statement that the init
process recognizes. And we loose the restriction based on how the
dynamic fingerprint is used in practice. Right now, we only searches
for the override of brand, name and device. And the placeholder
format should be ${placeholder}, with its value supplied by the
script caller.

As part of the implementation, we generate all the possible
combinations of the input boot variables. And recalculate the
fingerprint for each of the combination. Though we load the
build.prop multiple times, the logic is easier to follow. Also,
it's more convenient to enhance the logic if we only want to
allow some of the boot variables combination later.

Bug: 152167826
Change-Id: I4a9fa35c7ac037ff1cf4f9a4bdff602beac3894b
Test: unittests pass
2020-05-10 21:49:53 +00:00
Tianjie Xu 0fde41e711 Reland "Add a wrapper class PartitionBuildProp""
This reverts commit 6022545272.

The build prop for a partition used to be a simple key:value
dictionary. But we need more fields to hold the alternative build
props overriden by the 'import' statement. Therefore, add a new
class as a wrapper for these props first.

Bug: 152167826
Change-Id: I5c952cd2a976ba1a09ddc66d56c2b8b55a61986b
Test: unittests pass
2020-05-09 05:24:18 +00:00
Greg Kaiser 763c8a7691 Merge changes from topic "revert-1297095-MANSYJSCZY"
* changes:
  Revert "Add a wrapper class PartitionBuildProp"
  Revert "Calculate the runtime fingerprint prefixes from build prop"
2020-05-09 00:34:55 +00:00
Greg Kaiser 6022545272 Revert "Add a wrapper class PartitionBuildProp"
Revert submission 1297095

Bug: 156131275
Reason for revert: Broken build
Reverted Changes:
I2fe7e93a2:Add a wrapper class PartitionBuildProp
Iac093a40d:Calculate the runtime fingerprint prefixes from bu...

Change-Id: Ie846d23b9f5c3325d021236725826512be7a3c78
2020-05-09 00:30:33 +00:00
Greg Kaiser b21e48b499 Revert "Calculate the runtime fingerprint prefixes from build prop"
Revert submission 1297095

Bug: 156131275
Reason for revert: Broken build
Reverted Changes:
I2fe7e93a2:Add a wrapper class PartitionBuildProp
Iac093a40d:Calculate the runtime fingerprint prefixes from bu...

Change-Id: I8b1262c6e94a1db349de39896e56f366c8d64d4c
2020-05-09 00:30:33 +00:00
Tianjie Xu 8aba9ec7c8 Merge changes Iac093a40,I2fe7e93a
* changes:
  Calculate the runtime fingerprint prefixes from build prop
  Add a wrapper class PartitionBuildProp
2020-05-08 20:59:27 +00:00
Dan Shi fb42b79210 Merge "Revert "Add vts related artifacts to vts-core package"" 2020-05-08 20:03:06 +00:00
Dan Shi c4fa187094 Revert "Add vts related artifacts to vts-core package"
This reverts commit 5e06288e7c.

Bug: 149249068
Test: build
Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
2020-05-08 10:52:31 -07:00
David Zeuthen d5505f2c74 Update Keymaster AIDL to V2 in VNDK list
Bug: 156076333
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I293f4cca815b62bbbaf6334b36a83c669694fd12
2020-05-08 12:50:44 -04:00
Treehugger Robot 47f2597490 Merge "Build com.android.inprocess.tethering for Go variant" 2020-05-08 12:11:47 +00:00
markchien ddb0f0ab3b Build com.android.inprocess.tethering for Go variant
Bug: 155604224
Test: build
Change-Id: I1c5ac07e72068a617fa20797496dd022f279d88e
Merged-In: I1c5ac07e72068a617fa20797496dd022f279d88e
2020-05-08 09:33:42 +00:00
Bowgo Tsai 0f95ac7e8c Enables signing for generic boot images
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.

This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.

Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
      to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
      are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
2020-05-08 08:16:25 +00:00
Tianjie 0d2fcd50d7 Calculate the runtime fingerprint prefixes from build prop
In practice, some partners use the 'import' statement to override
the device fingerprint at runtime. The runtime fingerprint will
later add to the metadata of OTA package, so that the OTA server
can deliver the package to corresponding devices correctly.

This CL supports parsing a subset of import statement that the init
process recognizes. And we loose the restriction based on how the
dynamic fingerprint is used in practice. Right now, we only searches
for the override of brand, name and device. And the placeholder
format should be ${placeholder}, with its value supplied by the
script caller.

As part of the implementation, we generate all the possible
combinations of the input boot variables. And recalculate the
fingerprint for each of the combination. Though we load the
build.prop multiple times, the logic is easier to follow. Also,
it's more convenient to enhance the logic if we only want to
allow some of the boot variables combination later.

Bug: 152167826
Test: unittests pass
Change-Id: Iac093a40dc6f873c5e1858efa44cb2bd6082508a
2020-05-07 23:52:07 -07:00
Inseob Kim f369fefbce DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 153661471
Test: m selinux_policy
Change-Id: If1c77d867e5f454c6a159fcf9ba563dc9ec16e58
2020-05-08 11:16:29 +09:00
Jaewoong Jung 9150e7a65c Merge "Install .idsig files to test suite dirs." 2020-05-07 21:48:07 +00:00
Jaewoong Jung c8faeb574c Install .idsig files to test suite dirs.
(This is a cherry-pick change.)

Bug: 153675112
Test: m cts && ls out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d
Merged-In: I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d
2020-05-07 11:54:22 -07:00
Ivan Lozano 34f82e1af2 Merge "Add support for Rust coverage files from Soong." 2020-05-07 17:56:43 +00:00
Pete Bentley 60b649f32f Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." 2020-05-07 17:18:14 +00:00
Pete Bentley f5a05c4a4b Add boringssl_self_test to base PRODUCT_PACKAGES.
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.

I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.

Bug: 155520949
Test: m installclean && m

Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
2020-05-07 14:35:54 +01:00
vichang 5520858b97 Merge ""Move core-icu4j into i18n APEX" Attempt 2" 2020-05-07 09:34:51 +00:00