Commit Graph

57118 Commits

Author SHA1 Message Date
Harry Zhang
f03f60ea81 Merge "Revert "Add check-vintf-all target.""
am: 02e7851e02

Change-Id: I34a60d92c9305c3a30c05eea9cd5ae60cc512ba2
2020-01-14 13:37:14 -08:00
Harry Zhang
02e7851e02 Merge "Revert "Add check-vintf-all target."" 2020-01-14 21:34:51 +00:00
Harry Zhang
4192ca4845 Merge "Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks""
am: 19705c6987

Change-Id: I7422b0a3bdedaa1edeb15693452fe17c82ea3881
2020-01-14 13:15:48 -08: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
Yifan Hong
ea624d0c66 Merge changes from topic "build_time_vintf"
am: 997661002a

Change-Id: Ide4f47dec243b823ebd0b9d0e8c05ad0434ede35
2020-01-13 18:01:04 -08: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
LuK1337
3e3a93ca25 Merge "Make allmod() and pathmod() py3 compatible"
am: 5740e22d7c

Change-Id: Idcb7ff1903d720355bf23ff6ac9562130335ffef
2020-01-13 15:01:00 -08:00
Treehugger Robot
5740e22d7c Merge "Make allmod() and pathmod() py3 compatible" 2020-01-13 22:49:44 +00:00
Chih-hung Hsieh
966a03c534 Merge "Clean up cpp warning patterns"
am: 9c65671b91

Change-Id: Ibb54c5316a805e33fee2a2e21305a4eddb363b84
2020-01-13 14:09:35 -08:00
Chih-hung Hsieh
9c65671b91 Merge "Clean up cpp warning patterns" 2020-01-13 21:59:27 +00:00
Chih-Hung Hsieh
8724ff72ef Clean up cpp warning patterns
* Remove the useless 'option' key.
  It is only used in some C/C++ warning patterns
  to give a hint of options to turn to -Werror.
  Now the global default is -Werror.
* Factor out common code patterns into high/medium/low functions.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: Ibd3f768b1552ada925eb5afb0f01ab674c968a87
2020-01-13 11:10:54 -08:00
Ulyana Trafimovich
1448ba3a01 Merge "Use boot image extension in the JIT-zygote experiment."
am: d99a1faccc

Change-Id: I3a511eca1571f957cc96310b25f1242109096f63
2020-01-13 03:02:51 -08:00
Ulyana Trafimovich
d99a1faccc Merge "Use boot image extension in the JIT-zygote experiment." 2020-01-13 10:38:01 +00:00
Jiyong Park
ad7f7a9eec Merge "Correctly gather boot jars from APEXes"
am: 7434764cce

Change-Id: I46f39494e352cfee375271244c744ab8ad7e539c
2020-01-12 18:03:49 -08:00
Jiyong Park
7434764cce Merge "Correctly gather boot jars from APEXes" 2020-01-13 01:16:16 +00:00
LuK1337
b6a7819be6 Make allmod() and pathmod() py3 compatible
Change-Id: I8d58f2f64c03d54449844269974367f31de6ad31
2020-01-12 03:12:17 +01: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
Tobias Thierer
270568dce5 Merge "Disallow unnamed package on the bootclasspath."
am: 56772d7213

Change-Id: Ibad1b6bbf94fdbb85c9eb3c73dcc3f025f560287
2020-01-11 09:02:02 -08: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
Justin Yun
6f5b69aa41 Merge "Define PRODUCT_PRODUCT_VNDK_VERSION automatically"
am: 975b42501f

Change-Id: I91407c88913400bd5cfb2b9d2bb3ec685991e788
2020-01-11 05:00:57 -08:00
Treehugger Robot
975b42501f Merge "Define PRODUCT_PRODUCT_VNDK_VERSION automatically" 2020-01-11 12:44:46 +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
Chih-hung Hsieh
45237ef641 Merge "Use new Severity class and update *_warn_patterns"
am: ecfd19d576

Change-Id: If5e69478078c18e961b059dc7feae57663971ef1
2020-01-10 18:00:59 -08:00
Chih-hung Hsieh
ecfd19d576 Merge "Use new Severity class and update *_warn_patterns" 2020-01-11 01:50:26 +00:00
Chih-Hung Hsieh
949205a661 Use new Severity class and update *_warn_patterns
* This new class definition and patterns are
  shared between Android and ChromeOS compiler tools.
* Suppress hard to fix and false positive linter warnings.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: Icb47809100ad30796cb1da82610e989d450194fa
2020-01-10 15:21:20 -08: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
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
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
Dan Willemsen
5f8c93c7a2 Merge "Use our prebuilt M4 for flex and bison"
am: 5ec7b56e5d

Change-Id: Ie42d61f324d58f788113dc8a934cdeb64f361a97
2020-01-10 07:02:17 -08:00
Treehugger Robot
5ec7b56e5d Merge "Use our prebuilt M4 for flex and bison" 2020-01-10 14:39:53 +00:00
Robin Lee
7828ef71c0 Merge "Rebuild the vendor install-recovery if necessary."
am: b4484dc33b

Change-Id: I2d8b60d925707b9008601bcf6cdaf70fadc627bb
2020-01-10 06:01:58 -08:00
Treehugger Robot
b4484dc33b Merge "Rebuild the vendor install-recovery if necessary." 2020-01-10 13:49:55 +00:00
Robin Lee
51e68caa03 Merge "Go one directory up looking for releasetools path"
am: 88ab531831

Change-Id: Ib906e06db9c4cd2db389cdf2fb3c339436fa0130
2020-01-10 04:33:34 -08:00
Treehugger Robot
88ab531831 Merge "Go one directory up looking for releasetools path" 2020-01-10 12:31:32 +00:00
Bo Hu
30a5c0cf8b Merge "Revert "unbreak sdk_phone_x86 boot""
am: c30b734f42

Change-Id: I8b566b2b894f08a75c128a3c9f1f09a7d6cae092
2020-01-09 08:59:42 -08:00
Bo Hu
c30b734f42 Merge "Revert "unbreak sdk_phone_x86 boot"" 2020-01-09 16:56:35 +00:00
Anton Hansson
2bba9827af Merge "Update references to sdkext"
am: b9e912dc9d

Change-Id: Icad91431564900eb71af9a2aab9acb81ef12ab2e
2020-01-09 01:01:45 -08:00
Anton Hansson
b9e912dc9d Merge "Update references to sdkext" 2020-01-09 08:46:08 +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
Bo Hu
08a2677fe7 Revert "unbreak sdk_phone_x86 boot"
This reverts commit 70c96c7f11.

Reason for revert: root cause fixed

Bug: 146580512
Change-Id: I5d841637d5ca0ae8df8f5499a8b3f02488b4814e
2020-01-09 02:35:07 +00:00
Jiyong Park
bf9e4cdd81 Merge "jacoco-report-classes-all.jar includes jar from other partitions"
am: 3801c82e33

Change-Id: I0e424de854e315402ce17850dc91a8ab46843277
2020-01-08 16:53:09 -08:00
Treehugger Robot
3801c82e33 Merge "jacoco-report-classes-all.jar includes jar from other partitions" 2020-01-09 00:45:11 +00:00
Robin Lee
da427de124 Rebuild the vendor install-recovery if necessary.
Test: Manual on a device with VENDOR/bin/install-recovery.sh
Bug: 146504238
Bug: 68319577
Change-Id: I33c253716bda5e7e655dac5c0636e9995e7b64c1
2020-01-09 00:29:38 +01:00
Xin Li
155e70d596 Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
am: 2cfd952682

Change-Id: I10269a5645ce3e467a32401754a269513f31050d
2020-01-08 10:02:39 -08:00
Xin Li
03d08753b8 DO NOT MERGE - Merge January 2020 Security Release into master
am: c4dd701883

Change-Id: If900728b8de44b7c719085a39c9a590e80ed2045
2020-01-08 09:46:48 -08:00
Xin Li
2cfd952682 Merge "DO NOT MERGE - Merge January 2020 Security Release into master" 2020-01-08 17:39:17 +00:00
Anton Hansson
ea711c2418 Update references to sdkext
The module is getting renamed to sdkextensions.

Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
Merged-In: I628fc555b82e9bd931c8f0cce2222b02efad6036
(cherry picked from commit 37e998ac31)
2020-01-08 11:42:03 +00:00