Commit Graph

22765 Commits

Author SHA1 Message Date
Treehugger Robot
345dad3c36 Merge "Allow codename.fingerprint format for minSdkVersion" 2020-01-17 07:43:31 +00:00
Dan Willemsen
a9d2208cb1 Merge "Add strict module check to package-modules.mk"
am: 951ae30d56

Change-Id: I05619d5bcf0eede440a591a75ad5c9ac21a07467
2020-01-16 16:07:49 -08:00
Treehugger Robot
951ae30d56 Merge "Add strict module check to package-modules.mk" 2020-01-17 00:03:07 +00:00
TreeHugger Robot
2f0743483b Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:25 +00:00
Baligh Uddin
7ce531de8e Allow codename.fingerprint format for minSdkVersion
Use codename.fingerprint format for minSdkVersion if it is unset
in the manifest and
UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.

BUG: 130541924
2020-01-16 10:04:55 -08:00
Dan Willemsen
09c11073ac Add strict module check to package-modules.mk
The test lists keep getting out of date. Add a per-caller option so that
once they're clean on all builds we can stop them from regressing.

Test: add my_modules_strict := {true,false,,foo} to user
Change-Id: I3e09a8cbe5a07bbbff042b26cea7041c331dde96
2020-01-15 20:54:13 -08:00
Yifan Hong
2e4f20f540 Merge "device_(manifest|matrix).xml -> vendor_*" 2020-01-16 04:09:08 +00:00
android-build-team Robot
c3a9cb18ab Version bump to QQ2A.200305.002 [core/build_id.mk]
Change-Id: I91a18ae5d0c7f7ecc01ccaba25819e571681d419
2020-01-16 01:59:23 +00:00
Xin Li
6764f473a5 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I5adf4130f45200f3abfa2d65178a1640918e5a06
2020-01-15 15:56:28 -08:00
Jeongik Cha
3ff51e5346 Turn on PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE if PRODUCT_SHIPPING_API_LEVEL > 29
Set PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE true if
 1. PRODUCT_SHIPPING_API_LEVEL > 29
 2. OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE is set

Bug: 147711383
Test: Set PRODUCT_SHIPPING_API_LEVEL higher than 29, m nothing
Change-Id: Ib6aa2fd908b4bc13e3f759a07ece0e60dd3cc12f
2020-01-15 16:48:51 +09:00
Vic Yang
4873e65c8d Always check VNDK variant identicalness
Previously, we only check VNDK core and vendor variants are identical
when a VNDK library is not declared to have different variants AND the
target has TARGET_VNDK_USE_CORE_VARIANT set.  Therefore, it is fairly
easily to break a TARGET_VNDK_USE_CORE_VARIANT target as it needs to be
tested explicitly.

This change uses the new LOCAL_CHECK_SAME_VNDK_VARIANTS and expands the
check to run regardless of TARGET_VNDK_USE_CORE_VARIANT.  Also adds
support for VNDK-in-product.

Bug: 145157349
Test: Build success for targets with and without
      TARGET_VNDK_USE_CORE_VARIANT.
Test: With the corresponding change in build/make, remove libbinder
      from build/soong/cc/config/vndk.go and check build fails even
      when TARGET_VNDK_USE_CORE_VARIANT is not set.

Change-Id: Iec708b971072e6580f77a03e243b30b89b3b054d
2020-01-14 20:05:49 -08:00
Ryan Mitchell
15e6042b29 Do not remove RRO resources
Resource configs should not be deduped when building RROs since it
would be impossible to override some resource configs with the same
value as the default config. Also, aapt2 removes resources that do not
have default configurations. If an overlay attempts to overlay a
non-default configuration without overlaying the default, the resource
will be removed and the value will not be overlaid at all.

Bug: 146227008
Test: m-j
Change-Id: I1465b599cbf7f464d1b5b75a87e7dafa2cf734b0
2020-01-14 17:00:13 -08:00
Yifan Hong
605ea043c8 Reland "Improve BUILT_ASSEMBLED_*_MANIFEST checks"
This reverts commit d00ebcd740.

Reason for revert: reland CL

Test: m check-vintf-all

Change-Id: I6544197048a18745c80a954b9eccf69e7e438e9d
2020-01-14 14:25:31 -08:00
Yifan Hong
bcd46bc540 Reland "Add check-vintf-all target."
This reverts commit 152a783e2b.

Reason for revert: reland CL

Test: m check-vintf-all

Change-Id: I80fc789313edd3a9cc439a0b3a81e524e39b41b1
2020-01-14 14:25:16 -08:00
Yifan Hong
51be69f063 device_(manifest|matrix).xml -> vendor_*
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
Harry Zhang
02e7851e02 Merge "Revert "Add check-vintf-all target."" 2020-01-14 21:34:51 +00:00
Harry Zhang
19705c6987 Merge "Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks"" 2020-01-14 21:12:40 +00:00
Harry Zhang
152a783e2b Revert "Add check-vintf-all target."
Revert submission 1202895-build_time_vintf

Reason for revert: Build breakage at b/147648187
Reverted Changes:
I9791abc44: Improve BUILT_ASSEMBLED_*_MANIFEST checks
I6ee79910d: Add check-vintf-all target.

Change-Id: I6d9fd1747eaea492a3ebfe98c13ea4a5a2d22a33
2020-01-14 18:40:23 +00:00
Harry Zhang
d00ebcd740 Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks"
Revert submission 1202895-build_time_vintf

Reason for revert: Build breakage at b/147648187
Reverted Changes:
I9791abc44: Improve BUILT_ASSEMBLED_*_MANIFEST checks
I6ee79910d: Add check-vintf-all target.

Change-Id: If580207415d6ca54eb5fc653efc54d07b086f804
2020-01-14 18:40:23 +00:00
android-build-team Robot
135a6c88d9 Make change and version bump to QQ2A.200305.001
Change-Id: Ie4db9e5a6cf9a839804080ab3a2324ce21659de2
2020-01-14 01:56:23 +00:00
Paul Scovanner
62e01138c0 Update Security String to 2020-03-05
Bug:147450082
(cherry picked from commit 20c6e7dbe1)

Change-Id: If91cd1ba76ca9ce141bf10eff9df71ceb555518d
2020-01-14 01:40:01 +00:00
Yifan Hong
997661002a Merge changes from topic "build_time_vintf"
* changes:
  Improve BUILT_ASSEMBLED_*_MANIFEST checks
  Add check-vintf-all target.
2020-01-14 01:29:47 +00:00
android-build-team Robot
eddbc5f01f Version bump to QQ2A.200301.001 [core/build_id.mk]
Change-Id: Ic73d8f01f6eecd105b30dbc95be8ce2d53ecb4df
2020-01-14 00:14:08 +00:00
Ulyana Trafimovich
d99a1faccc Merge "Use boot image extension in the JIT-zygote experiment." 2020-01-13 10:38:01 +00:00
Jiyong Park
7434764cce Merge "Correctly gather boot jars from APEXes" 2020-01-13 01:16:16 +00:00
android-build-team Robot
5a8f8f0118 Make change and version bump to QQ2A.200113.001
Change-Id: I2a78e03432d63ae730c1927512e5cc376bd4ba20
2020-01-12 21:20:52 +00:00
android-build-team Robot
c428ebe5c8 Make change and version bump to QQ2A.200112.001
Change-Id: I5b5a11dfe2e32b38a6b8bf994f73f822e0abcbc2
2020-01-12 00:24:00 +00:00
Yifan Hong
8bdfe365d6 Improve BUILT_ASSEMBLED_*_MANIFEST checks
They are moved into check-vintf-all, which is more
accurate and do not require building full OS images.

Also move kernel check code down to check_vintf_compatible. There
is no assembled manifest to put kernel configs now, but they are still
required for build time OTA VINTF checks.

Test: builds
Test: change a vintf_fragment file to cause a conflict with main manifest file
(add health@2.0 to boot@1.1.xml), and check_vintf_vendor_log fails

Change-Id: I9791abc440a40e1537b4387eb67575ff2e22df08
2020-01-11 19:06:18 +00:00
Automerger Merge Worker
4e58211e92 Merge "Disallow unnamed package on the bootclasspath." am: 56772d7213 am: 270568dce5
Change-Id: Id27e23f919dcdfbc140daf0f3f680b59fbfd1c47
2020-01-11 17:10:48 +00:00
Treehugger Robot
56772d7213 Merge "Disallow unnamed package on the bootclasspath." 2020-01-11 16:42:21 +00:00
Tobias Thierer
af482ea053 Disallow unnamed package on the bootclasspath.
There are currently no classes on the bootclasspath that live in the
unnamed package (empty package name). This CL explicitly forbids it.
This has the side effect of guarding against some classes of bugs,
for example R8 has functionality to generate some helper classes in
the unnamed package that should not be on the to bootclasspath
because they would hide corresponding classes in Applications.

Strictly speaking I believe that the "not package_name or " part
of the condition in the touched script is not needed because
LoadWhitelist() already skips empty lines and doesn't add "^$" to
the whitelist regex, but relying on this seems very fragile. If
there ever is a need to have classes in the bootclasspath's
unnamed package in future then we can always change this again.

Bug: 147480264
Test: Treehugger

Change-Id: Ic310dd0779dde133b3a5c3039ea5b70d31331a9b
2020-01-11 16:07:13 +00:00
Automerger Merge Worker
e2c8d4155b Merge "Define PRODUCT_PRODUCT_VNDK_VERSION automatically" am: 975b42501f am: 6f5b69aa41
Change-Id: I1d5fe1f346075f7edbc9c31c4701e12e50526193
2020-01-11 13:16:31 +00:00
Justin Yun
66c7af81f3 Define PRODUCT_PRODUCT_VNDK_VERSION automatically
PRODUCT_PRODUCT_VNDK_VERSION will be automatically set to true for
the devices with PRODUCT_SHIPPING_API_LEVEL newer than 29.

Bug: 146621746
Test: build with PRODUCT_SHIPPING_API_LEVEL set to 30
Change-Id: I78cd81d1d61e9089b163169bc495df8a880463da
2020-01-11 12:44:08 +00:00
android-build-team Robot
84156c4d9a Make change and version bump to QQ2A.200111.001
Change-Id: I62dd06adc68db16010b122392e4e308f713189d4
2020-01-11 02:41:11 +00:00
Automerger Merge Worker
bcaf4bd93c Update Security String to 2020-03-01 am: 436b42a079
Change-Id: Iad3d14548ea426fbb321be2f4b5ee9be93687d93
2020-01-10 23:25:28 +00:00
Yifan Hong
850f8b5d77 Add check-vintf-all target.
Add target that checks VINTF compatibility of the current build
(in $PRODUCT_OUT) properly. The target:

- Doesn't require a full build
- Won't run for system-only AOSP targets

A verbose log is printed if `m check-vintf-compatible` is executed,
but it won't show up if `m` is executed.

(After this patch, adding product / system_ext matrices is as simple
as defining a vintf_compatibility_matrix in Soong, and VINTF
compatibility is properly checked.)

Test: m check-vintf-all
Test: delete */etc/vintf and m check-vintf-all
Test: m
Test: m check-vintf-all on device with vendor/odm and ODM SKU-specific
      manifests

Test: change manifest.xml to be incompatible and m check-vintf-all fails

Bug: 140280874
Bug: 140360109

Change-Id: I6ee79910d745d29cfc9b05b1435e26f91b7c10f7
2020-01-10 13:17:56 -08:00
Paul Scovanner
436b42a079 Update Security String to 2020-03-01
Bug:147450082
2020-01-10 19:30:07 +00:00
Peter Collingbourne
86cdf9c2f4 Update make build system for dynamic unwinder.
Change the unwinder linking logic to match soong.

Bug: 144430859
Change-Id: I739980e479d14707b7a3afd6e9d2c817c9b43f81
2020-01-10 11:09:52 -08:00
android-build-team Robot
0fee05cd2c Version bump to QQ2A.200110.003 [core/build_id.mk]
Change-Id: I89e1ea9f79ccef75f0cf177a04bf909f706a3e74
2020-01-10 18:05:26 +00:00
Ulya Trafimovich
bd98b55100 Use boot image extension in the JIT-zygote experiment.
Test: temporarily enable JIT-zygote configuration, build, boot the
  device and ensure that the JIT-zygote specific boot image
  apex-framework.art is mapped in the zygote address space:

  1. enable Jit zygote in the product device config (in my case
    device/google/muskie/aosp_walleye.mk):

    +# System server should not contain compiled code.
    +PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := verify
    +
    +# Use the apex image for preopting.
    +DEXPREOPT_USE_APEX_IMAGE := true
    +
    +# Have the runtime pick up the apex image.
    +PRODUCT_PROPERTY_OVERRIDES += \
    +    dalvik.vm.boot-image=/apex/com.android.art/javalib/apex.art:/system/framework/apex-framework.art

  2. lunch aosp_walleye-userdebug \
    && m \
    && adb reboot bootloader \
    && fastboot flashall -w

  3. adb shell cat /proc/`adb shell ps | grep zygote64 | awk {'print $2'}`/maps | grep apex-framework.art
  6fe44000-7025c000 rw-p 00000000 fc:02 1179718                            /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art
  70571000-70696000 rw-p 0072d000 fc:02 1179718                            /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art
  75a339f000-75a33ac000 r--p 00852000 fc:02 1179718                        /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art

Change-Id: I6818fde087ec562057631003265bc1ec0e91688c
2020-01-10 15:29:42 +00:00
Automerger Merge Worker
264e119cba Merge "Use our prebuilt M4 for flex and bison" am: 5ec7b56e5d am: 5f8c93c7a2
Change-Id: Iaa0611529b0e49934e3c699702803cce8a02adb8
2020-01-10 15:15:55 +00:00
Jiyong Park
ee75813162 Correctly gather boot jars from APEXes
Jars in APEXes have Make module names <jar_name>.<apex_name>. e.g.
updatable-apex.com.android.media. Previously, we have used <jar_name>
which actually meant the platform variant of the jar. This is not only
incorrect, but also is causing problem as the platform variant is no
longer available when the jar is configured to be available only for the
corresponding APEX (via the apex_available property).

Fixing the problem by correctly using <jar_name>.<apex_name> scheme.

Bug: N/A
Test: m

Change-Id: I6e255ce88c9bd80120b29197fb2637a64010f531
Merged-In: I6e255ce88c9bd80120b29197fb2637a64010f531
2020-01-10 15:15:47 +00:00
android-build-team Robot
561ca944d2 Make change and version bump to QQ2A.200110.002
Change-Id: Idb198305d74730ce6a80911513a017c8bad3de82
2020-01-10 05:24:28 +00:00
android-build-team Robot
55727a79ba Make change and version bump to QQ2A.200110.001
Change-Id: Ib7003b845bc94b6e6939f1f5e1e1c98e719924e1
2020-01-10 02:20:27 +00:00
Dan Willemsen
38dc09d39a Use our prebuilt M4 for flex and bison
And ensure we've got all the proper dependencies.

Bug: 117561006
Test: treehugger
Change-Id: Ia9690b2c0d73a48744c8e33fe83196d02b1e904d
2020-01-08 22:31:12 -08:00
android-build-team Robot
4823ddaf5c Make change and version bump to QQ2A.200109.001
Change-Id: I9fd4d1279921001b5b8ad166508f2ba9a88b88e8
2020-01-09 02:21:26 +00:00
Automerger Merge Worker
cccefb9901 Merge "jacoco-report-classes-all.jar includes jar from other partitions" am: 3801c82e33 am: bf9e4cdd81
Change-Id: I6adf59d2188289165034d7374fe50ad1f32dda54
2020-01-09 01:05:03 +00:00
Treehugger Robot
3801c82e33 Merge "jacoco-report-classes-all.jar includes jar from other partitions" 2020-01-09 00:45:11 +00:00
Xin Li
2cfd952682 Merge "DO NOT MERGE - Merge January 2020 Security Release into master" 2020-01-08 17:39:17 +00:00
Automerger Merge Worker
fd21bc3523 Merge "Remove generation of the dexpreopt tool paths from make." am: 2e31874c7a am: ee786b748d
Change-Id: If26967a4a119f201f1525e02cc4a8b68b20bd655
2020-01-08 11:30:38 +00:00