Commit graph

56911 commits

Author SHA1 Message Date
Jiyong Park
f8b8c647e4 Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available

Change-Id: I8b4eed03c76153e2469f7b3e2e33c6e20e6e0409
2019-12-19 18:16:34 +09:00
Treehugger Robot
812e606ac8 Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR" 2019-12-19 08:40:45 +00:00
Chih-hung Hsieh
9b88d8f8b1 Merge "Split warn.py into multiple files" 2019-12-19 04:30:08 +00:00
Jiyong Park
54aec677da Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available

Change-Id: Ie2314d1f4cb2b92f005dfc77fcfd7ebace88e48f
2019-12-19 12:35:29 +09:00
Joseph Murphy
7378ff158c Merge changes from topic "revert-1191937-art_apex_available-DWXQGTKMAR"
* changes:
  Revert submission 1191937-art_apex_available
  Revert submission 1191937-art_apex_available
2019-12-19 01:20:03 +00:00
Joseph Murphy
92e1a0bea0 Revert submission 1191937-art_apex_available
Original Commit Message:
"""
Rename modules that are APEX-only

The renamed modules are only available for APEXes, but not for the
platform. Use the <module_name>.<apex_name> syntax to correctly install
the APEX variant of the modules.
"""

Reason for revert: Build Cop - Breaks about 15 AOSP targets, with high confidence due to these changes being the only non-robot changes in those builds.

Reverted Changes:
I190ce2d10:Use apex_available property
I990e0a67e:Use apex_available property
I0d1295683:Revert "Avoid duplicated classes for boot dex jars...
I5fb725403:Find the jar libraries in APEX from the correct pa...
I322b1efcc:Rename modules that are APEX-only
Ifa2bd0f8f:Use apex_available property
Iac6533177:Use apex_available property
Ie999602c6:Use apex_available property
I2a3d73397:Use apex_available property
Ic91bcbb9a:Use apex_available property
Ia6c324eed:Use apex_available property
I964d0125c:Use apex_available property

Change-Id: I8961702cfb414ebec55014f57e0be3347b34cea9
2019-12-19 01:06:41 +00:00
Joseph Murphy
9bc1c0032c Revert submission 1191937-art_apex_available
Original Commit Message:
"""
Rename modules that are APEX-only

The renamed modules are only available for APEXes, but not for the
platform. Use the <module_name>.<apex_name> syntax to correctly install
the APEX variant of the modules.
"""

Reason for revert: Build Cop - Breaks about 15 AOSP targets, with high confidence due to these changes being the only non-robot changes in those builds.

Reverted Changes:
I190ce2d10:Use apex_available property
I990e0a67e:Use apex_available property
I0d1295683:Revert "Avoid duplicated classes for boot dex jars...
I5fb725403:Find the jar libraries in APEX from the correct pa...
I322b1efcc:Rename modules that are APEX-only
Ifa2bd0f8f:Use apex_available property
Iac6533177:Use apex_available property
Ie999602c6:Use apex_available property
I2a3d73397:Use apex_available property
Ic91bcbb9a:Use apex_available property
Ia6c324eed:Use apex_available property
I964d0125c:Use apex_available property

Change-Id: I39316f9ef2b0cd6c0a347f6b51d011748d0681aa
2019-12-19 01:06:36 +00:00
Jiyong Park
e09efa6473 Merge changes from topic "art_apex_available"
* changes:
  Find the jar libraries in APEX from the correct path
  Use apex_available property
2019-12-19 00:21:43 +00:00
Treehugger Robot
0cb1ca1c4c Merge "Raise an error when partition setting is wrong" 2019-12-18 23:56:44 +00:00
David Anderson
2e44964719 Merge "releasetools: Pass --virtual-ab to lpmake." 2019-12-18 15:42:44 +00:00
Treehugger Robot
ff81b9d1d0 Merge "Remove Soong intermdiates after moving image mutator" 2019-12-18 02:34:35 +00:00
Kiyoung Kim
b80f88f424 Merge "Do not include linkerconfig for recovery" 2019-12-18 00:55:03 +00:00
Chih-Hung Hsieh
888d143e4c Split warn.py into multiple files
* Split warning patterns into *_warn_patterns.py
* Split project list into android_project_list.py
* Split out the Severity class, to be changed later
* Split core of warn.py into warn_common.py and
  leave only platform dependent code in warn.py.
  This allows the core logic be used with different
  parallel processing libraries.
* Old warn.py just calls -m warn.warn.

Test: path_to_build/tools/warn.py build.log
Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Change-Id: I6734e4472a21018cd5ce06d549f6dbca24f4de54
2019-12-17 15:12:31 -08:00
Colin Cross
78f86aa083 Remove Soong intermdiates after moving image mutator
Bug: 142286466
Test: m
Change-Id: I76f19a4504b8231755009ab200447613f02b85cf
Merged-In: I76f19a4504b8231755009ab200447613f02b85cf
(cherry picked from commit 559ab613ae)
2019-12-17 14:53:49 -08:00
Treehugger Robot
20d1b7d966 Merge "Move CtsShim and CtsPrivShim APKs out of system." 2019-12-17 19:55:35 +00:00
Dario Freni
d5ed6019c9 Move CtsShim and CtsPrivShim APKs out of system.
These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.

Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Merged-In: I03939f6c3e711d5887da201e32173f86a6b0289e
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
2019-12-17 13:47:17 +00:00
Jeongik Cha
bb688a9fa9 Raise an error when partition setting is wrong
When setting target out path at root(/product, /system_ext), either file
system type or prebuilt image must be set. If not, we'd rather raise an
error.

Without raising an error, the artifacts in these directory are not
included in any image.

And also, extract these logics into function, and check product, odm, system_ext
For now, exempt vendor image because of some targets with prebuilt
vendor image.
Bug: 137169253
Test: set TARGET_COPY_OUT_PRODUCT := product
          BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE :=
	  BOARD_PREBUILT_PRODUCTIMAGE :=
      and then check if it causes an error.
Test: set TARGET_COPY_OUT_PRODUCT := system/product
          BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 or
	  BOARD_PREBUILT_PRODUCTIMAGE := someimage.img
      and then check if it causes an error.

Change-Id: Ibf0f7838111075ba3649e198e5649aa7e8e29d7c
2019-12-17 22:41:56 +09:00
Treehugger Robot
4d5458d1f0 Merge "Add libdl_android.so to the system partition absence check." 2019-12-17 13:07:26 +00:00
Jiyong Park
439b829b42 Find the jar libraries in APEX from the correct path
JAR libraries in the ART and conscrypt APEXes are no longer built for
the platform. Therefore, the path out/target/common/<name>_intermediates
does not exist. Instead use the path
out/target/common/<libname>.<apexname>_intermediates paths for those
APEX-only jars.

Bug: 128708192
Bug: 133140750
Test: m

Change-Id: I5fb725403ac22198e5ce6d77ca97c5f3392fabfd
2019-12-17 21:16:34 +09:00
Jiyong Park
0d7bd6be90 Use apex_available property
Use apex_available property to prevent modules that are only for the ART
apex from being used outside of the APEX.

Bug: 128708192
Bug: 133140750
Bug: 129006418
Test: m
Test: m libnativeloader doesn't install anything. (because it doesn't
have "//apex_available:platform".
Test: Add "libnativeloader" to shared_libs of "libvndksupport" which is
installed to /system/lib. Then the build fails with following error:

  error: system/core/libvndksupport/Android.bp:3:1: module
  "libvndksupport" variant "android_arm_armv8-a_core_shared": depends on
  //art/libnativeloader:libnativeloader which is not visible to this
  module

Change-Id: I964d0125cfedb454a60c098bf1a1797201d5dd40
2019-12-17 21:16:20 +09:00
Kiyoung Kim
2cf6c27240 Do not include linkerconfig for recovery
Linkerconfig should be built as static, but recovery does not have
enough space for static binary. As recovery linker configuration is
quite static and simple, this can be generated from build time. As a
first step linkerconfig binary should be removed from recovery.

Bug: 146384333
Test: m -j passed && crosshatch recovery worked with this change
Change-Id: Ie82da787424c5d1ddd2724808aa2323ea881f75b
2019-12-17 15:27:02 +09:00
Treehugger Robot
2f4a8bb534 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" 2019-12-17 05:51:34 +00:00
Treehugger Robot
de5b0d2a73 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" 2019-12-17 04:57:10 +00:00
David Anderson
117b52f74e releasetools: Pass --virtual-ab to lpmake.
Note that we are currently excluding this flag for retrofit devices,
since it necessitates support for a newer super.img format, which
retrofit devices may not fully support.

Bug: 134949511
Test: m -j, lpdump super_empty.img
Change-Id: Id69a8d755b9f4c4bb5fbd456a416ced1a5f1d135
2019-12-16 22:17:28 +00:00
Martin Stjernholm
42ae1c8c8f Add libdl_android.so to the system partition absence check.
Test: m
Bug: 144343305
Change-Id: Ie3a9698d4d369a68ce2baffbab448af63ead4410
2019-12-16 21:43:45 +00:00
Nick Desaulniers
5c3bf1b164 Merge "build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only" 2019-12-16 21:13:28 +00:00
Treehugger Robot
55406a8458 Merge "Remove Soong intermediates after renaming core variant" 2019-12-16 20:54:32 +00:00
Nick Desaulniers
9882f6f7be build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only
Also, prefer
-Wl,--execute-only
rather than
-Wl,-execute-only

Bug: 139945549
Bug: 146144180
Test: m
Change-Id: I4a07978c7a84a0a7e841b9e059305b0f443d0e95
Suggested-by: Ryan Prichard <rprichard@google.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-12-16 09:55:05 -08:00
Anton Hansson
68209e4519 Merge "Verify updatable jars are in PRODUCT_BOOT_JARS" 2019-12-16 15:13:58 +00:00
Luke Huang
ced27c4c60 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." 2019-12-16 14:39:02 +00:00
Luke Huang
723ff8274d Add com.android.cronet APEX and org.chromium.net.cronet to base_system.
com.android.cronet will be shipped as a mainline
module in APEX format.

org.chromium.net.cronet is a java_sdk_library used to provide
Cronet API to apps.

Bug: 139397529
Test: Built and installed apex on device
Change-Id: Icff7ded02e360f2df9dfe3ac7185cf7f0034d014
2019-12-16 20:57:05 +08:00
Anton Hansson
37a037e05e Verify updatable jars are in PRODUCT_BOOT_JARS
A jar should never be in just the updatable list.

Test: treehugger
Change-Id: I806eb2d00502f98aa2c40fba3fc644cfddc64ad9
2019-12-16 11:27:18 +00:00
Yo Chiang
3bbbe2d5b9 Revert "Revert "Remove ro.apex.updatable=false in GSI""
This reverts commit c7f63dfeda.

Reason for revert: b/145963716

Change-Id: I0f6a9c26b342a27dfebc0494a255492c838c09f5
2019-12-16 08:38:59 +00:00
Treehugger Robot
8e3bc2d4ce Merge "Adding missing dependencies for vbmetaimage-nodeps" 2019-12-16 04:47:56 +00:00
Yo Chiang
96949d3904 Define PRODUCT_SYSTEM_* props for mainline_system
These properties, namely:

- PRODUCT_SYSTEM_NAME
- PRODUCT_SYSTEM_BRAND
- PRODUCT_SYSTEM_MANUFACTURER
- PRODUCT_SYSTEM_MODEL
- PRODUCT_SYSTEM_DEVICE

propagate into /system/build.prop as ro.product.system.* and can
identify if the /system partition is mainline_system.
These don't modify other ro.product.* properties that are defined in
partitions other than /system.

Bug: 110206836
Bug: 146191296
Test: lunch mainline_system_arm64-userdebug; m
Test: lunch aosp_arm64-userdebug; m
Test: Two products must have same PRODUCT_SYSTEM_* props
Change-Id: I300579d555d269481635237fb02aab5db71a510d
2019-12-15 15:11:53 +00:00
Dan Willemsen
6fe297fcc5 Merge "Write list of copy headers" 2019-12-15 00:04:15 +00:00
Colin Cross
66ce55d90d Remove Soong intermediates after renaming core variant
Bug: 142286466
Test: m
Change-Id: Ib10a9cf8a8c9109279523f811764afff34969368
Merged-In: Ib10a9cf8a8c9109279523f811764afff34969368
(cherry picked from commit c293f9583e4ac726c1c44406725e2bbf7d3efdad)
2019-12-13 20:46:35 -08:00
Dan Willemsen
79a0caff35 Write list of copy headers
So that soong_ui can remove obsolete headers that have been removed.

Test: cat out/target/product/crosshatch/.copied_headers_list
Test: cat out/target/product/generic/.copied_headers_list
Change-Id: I7df8029c1f2ed630d35c357f94e5dfb668e5824f
2019-12-13 19:35:05 -08:00
Treehugger Robot
793147469e Merge "Initialize common_proguard_flags for each module" 2019-12-14 02:52:59 +00:00
Colin Cross
2a40672597 Initialize common_proguard_flags for each module
Id938aa35e87c9c69769a3184dfea06fd02299688 removed the initial
assignment to common_proguard_flags, which both makes it grow as
each module is parsed and also turns it into a lazily evaluated
variable.  That causes the flags passed to R8 to be the flags
computed for the current module multiplied by the number of previously
parsed modules.

Fixes: 146150575
Test: m checkbuild
Change-Id: I87c9625496f482896be6867124f2f12ff662cd57
2019-12-13 16:23:11 -08:00
Treehugger Robot
565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +00:00
Treehugger Robot
ed7d5f12e3 Merge "Make AOSP master use AOSP.MASTER as BUILD_ID." 2019-12-13 22:49:08 +00:00
Treehugger Robot
d6aa90ce9a Merge "sign_target_apks: Add networkstack to default key_map" 2019-12-13 22:22:08 +00:00
Treehugger Robot
b3bff1d203 Merge changes from topic "gsi-with-flattened-apexes"
* changes:
  Enable updatable-apex.mk for mainline_system
  Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
2019-12-13 21:10:56 +00:00
Treehugger Robot
9088392b6b Merge "Add AFTL relevant options to OPTIONS in common.py." 2019-12-13 05:54:58 +00:00
Yo Chiang
078b1598ff Merge "Add mainline_system_x86_64 product" 2019-12-13 05:22:15 +00:00
Treehugger Robot
dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +00:00
Kiyoung Kim
0542582560 Merge "Add linkerconfig to recovery" 2019-12-13 01:09:58 +00:00
Dan Austin
5290364e9b Add AFTL relevant options to OPTIONS in common.py.
Adds AFTL relevant options in preparation for avbtool changes. The
options are:
aftl_server: A string representing the URL of the transparency log.
aftl_key_path: The path to the public key associated with the
transparency log (in PEM format).
aftl_manufacturer_key_path: The path to the key associated with the
manufacturer for AFTL message signing.
aftl_signing_helper: The signing helper for use with AFTL message
signing.

Change-Id: I73d466f24b171c16dbdaa40c589779bed52be551
Test: Ran add_img_to_target_files with all AFTL options.
Bug: 138779249
2019-12-12 15:48:52 -08:00
Dario Freni
99f5e40137 Enable updatable-apex.mk for mainline_system
Test: presubmit passes
Bug: 145791146
Change-Id: I87fb58c4d8d3d02d46af467d62222782658e73dc
2019-12-12 17:21:17 +00:00