Commit graph

5162 commits

Author SHA1 Message Date
Roshan Pius
dfbf38599c Revert "Revert "product: Remove wifi-service off SystemServerCla..." am: 48825727f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12282976

Change-Id: Icf14b0d6862a0572f67a547faf1760a2d891a439
2020-08-04 00:45:39 +00:00
Roshan Pius
48825727f6 Revert "Revert "product: Remove wifi-service off SystemServerCla..."
Revert submission 10144846-revert-10103769-load_wifi_service_dynamically-XZNQJHXURR

Reason for revert: Changes in build system to store uncompressed and aligned DEX files for java libs in APEXes.

Reverted Changes:
Icc0b680c2: Revert "SystemServer: Dynamically load wifi-servic...
I83a2f93e3: Revert "product: Remove wifi-service off SystemSer...

Bug: 148099857
Bug: 162371380
Bug: 162746981
Test: build
Change-Id: Ia40bc9dec81347e205e5ff81d7b9045655fbe13a
2020-08-03 17:27:21 +00:00
Orion Hodson
b1cb2ceaec Merge "Update ART people in OWNERS" am: 1e78685543 am: 9e635161cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1376377

Change-Id: Ia458c55ca6a9c0a43d0c0778b23df924e7e99f7d
2020-08-03 09:04:24 +00:00
Orion Hodson
4202696f12 Update ART people in OWNERS
Test: build/make/tools/checkowners.py -c -v build/make/target/product/OWNERS
Change-Id: Ie658227a8dd1230cf289655d1b6d642abea06787
2020-07-29 15:45:28 +01:00
Devin Moore
e5f33227a8 Merge "Add android.hardware.common and android.hardware.graphics.common" 2020-07-20 23:25:26 +00:00
Yifan Hong
76a337f65e Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I4aaa3967e889923f0958afaa3227474176e36ea9
2020-07-17 22:52:14 +00:00
Yifan Hong
f496f1b94f Add odm_dlkm partition.
Test: define odm_dlkm in CF.
Bug: 156020364
Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 12:34:29 -07:00
Devin Moore
e46fd2d83d Add android.hardware.common and android.hardware.graphics.common
Added by calling update-vndk-list.sh

Test: Builds
Change-Id: I04f4ac48e9383faebed89a673dd4856d07dd5256
2020-07-15 15:46:17 -07:00
Hung-ying Tyan
9ca864f88a Merge "Enable vbmeta_system for GSI targets" am: 6fa0dd9b94 am: 38267e1455
Original change: https://android-review.googlesource.com/c/platform/build/+/1359124

Change-Id: I85ad96c79f7d04c00a3aaee2fdbca7ddec709dad
2020-07-15 07:05:59 +00:00
Hung-ying Tyan
6fa0dd9b94 Merge "Enable vbmeta_system for GSI targets" 2020-07-15 06:34:34 +00:00
Yifan Hong
9fce02b625 Add vendor_dlkm partition. am: cfb917a1c7 am: 58af66905e
Original change: https://android-review.googlesource.com/c/platform/build/+/1316438

Change-Id: I84a4ffc60242ba92ade09dba87ba53a15394fe9f
2020-07-14 19:47:16 +00:00
Hung-ying Tyan
1785816ca1 Enable vbmeta_system for GSI targets
in order to mix GSI onto android10 Cuttlefish.

Bug: 158302764
Test: mixing GSI onto android10 Cuttlefish
Change-Id: I77385495583034324f5e29bed27c588dc98215e2
2020-07-14 16:04:20 +00:00
Yifan Hong
cfb917a1c7 Add vendor_dlkm partition.
Test: define vendor_dlkm for CF.
Bug: 156020364

Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-07-13 14:20:56 -07:00
Jooyung Han
861f077f09 Remove hidl VNDK libs
hidl libs are removed from VNDK unless used by other VNDK libs.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
2020-07-07 16:20:41 +09:00
Jooyung Han
586930f6c1 Merge "Remove hidl VNDK libs" into rvc-dev-plus-aosp 2020-07-06 21:16:10 +00:00
Anton Hansson
da72204d91 Remove vendor/... path checks DO NOT MERGE am: e6c24147f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: I5c4e882eba712f31e445bee5c8044a10f791d67a
2020-07-02 09:32:23 +00:00
Jooyung Han
37aeef03d4 Remove hidl VNDK libs
hidl libs are removed from VNDK unless used by other VNDK libs.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
2020-07-02 12:48:14 +09:00
Anton Hansson
e6c24147f0 Remove vendor/... path checks DO NOT MERGE
The vendor path check is incompatible with the current setup of prebuilt
module stubs.

Bug: 160165426
Test: lunch mainline_system_x86 ; m nothing
Change-Id: I5aa809dc3e0c9b36e6963585bb60fd446a234022
2020-07-01 15:27:37 +01:00
Jiyong Park
85471ed82e pm.dexopt.* props in runtime_libart.mk becomes optional
The mk file is designed to provide safe default values which can be
overridden by target-specific mk files. Previously it was difficult to
correctly configure the mk files because the final prop value that
is baked in the system/build.prop is highly dependent (and sensitive as
well) to the mk file inheritance order which is very difficult (and
non-intuitive) to follow.

I9c073a21c8257987cf2378012cadaeeeb698a4fb is an attempt to make it much
easier and intuitive. Specifically, the new `a ?= b` syntax makes the
assignment optional, which means it is used only when there is no
non-optional assignment for the same prop regardless of the relative
ordering among them. In addition, the change prohibits having multiple
non-optional prop assignments for the same prop name.

pm.dex.* prop in runtime_libart.mk are now set using the `a ?= b` syntax
to explicitly mark that they provide default values.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I044486d313d699607cd54222ae34d9eae24762b9
(cherry picked from commit bca4ea477a)
Change-Id: I044486d313d699607cd54222ae34d9eae24762b9
2020-06-30 18:44:30 +09:00
Jiyong Park
19746f4686 Some properties are set as optional
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
(cherry picked from commit dfb3937ce4)
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
2020-06-30 18:44:24 +09:00
Jiyong Park
8d521ec2c8 ro.zygote in base_system.mk is optional
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
2020-06-30 18:44:17 +09:00
Jiyong Park
8af29d4ec0 pm.dexopt.* props in runtime_libart.mk becomes optional
The mk file is designed to provide safe default values which can be
overridden by target-specific mk files. Previously it was difficult to
correctly configure the mk files because the final prop value that
is baked in the system/build.prop is highly dependent (and sensitive as
well) to the mk file inheritance order which is very difficult (and
non-intuitive) to follow.

I9c073a21c8257987cf2378012cadaeeeb698a4fb is an attempt to make it much
easier and intuitive. Specifically, the new `a ?= b` syntax makes the
assignment optional, which means it is used only when there is no
non-optional assignment for the same prop regardless of the relative
ordering among them. In addition, the change prohibits having multiple
non-optional prop assignments for the same prop name.

pm.dex.* prop in runtime_libart.mk are now set using the `a ?= b` syntax
to explicitly mark that they provide default values.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I044486d313d699607cd54222ae34d9eae24762b9
(cherry picked from commit bca4ea477a)
Change-Id: I044486d313d699607cd54222ae34d9eae24762b9
2020-06-30 14:28:25 +09:00
Jiyong Park
7b933fb576 Some properties are set as optional
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
(cherry picked from commit dfb3937ce4)
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
2020-06-30 14:28:16 +09:00
Jiyong Park
b00931e7eb ro.zygote in base_system.mk is optional
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
2020-06-30 14:28:04 +09:00
Jooyung Han
8f4bc20787 Merge "GSI: install flattened cts shim" into rvc-dev am: cd1aaed4f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910091

Change-Id: I1c7e6b2f3f3e6645e475a8ebb8dc17b3da423895
2020-06-22 17:20:52 +00:00
Jooyung Han
cd1aaed4f0 Merge "GSI: install flattened cts shim" into rvc-dev 2020-06-22 17:05:58 +00:00
Jooyung Han
15f9085595 GSI: install flattened cts shim
The flattened version of com.android.apex.cts.shim.v1 should be
explicitly installed because the shim apex is prebuilt one and
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not supported for
prebuilt_apex modules yet.

Bug: 158169437
Bug: 159392784
Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened
      # should install the prebuilts of shim APKs
Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
2020-06-19 20:09:06 +09:00
TreeHugger Robot
7fe2cf07aa Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072

Change-Id: Ib79da635eda60f3290402cb47d79600737c12d2a
2020-06-19 03:41:56 +00:00
yawanng
77107a17e5 iorap: Turn off pinner by default for large memory devices.
Bug: 157667363
Test: Make
Change-Id: I980a470596da3bf4e500bbd6c517e1a022c2d1a0
2020-06-19 00:47:17 +00:00
TreeHugger Robot
aec1debc65 Merge "Skip mount /oem on GSI" into rvc-dev 2020-06-18 15:32:41 +00:00
Jing-yan, Jang
a46fd29698 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I6154f915c8ddb457fcbbf4cb8acdafe89b1dab16
2020-06-18 06:54:01 +00:00
Jing-yan, Jang
dd592d87ec Merge "Identity: Add credstore" into rvc-dev 2020-06-18 06:47:03 +00:00
TreeHugger Robot
588cb3cc06 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ibb6f34cc37ea3b6bc269b8a73073807f0d02f0ae
2020-06-17 21:01:59 +00:00
Tim Van Patten
25db69a401 Remove ANGLE from base_system.mk
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.

Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
2020-06-17 12:38:25 -06:00
SzuWei Lin
03a29a6974 Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Merged-In: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
(cherry picked from commit f8475cc49f)
2020-06-17 18:18:20 +08:00
Treehugger Robot
7e0ddb1e59 Merge "Skip mount /oem on GSI" am: 03db4fbbb7 am: f775227f30
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103

Change-Id: Id7dcfff53ea7635ffc142b37fe25dfdc408c82c1
2020-06-17 08:55:48 +00:00
Treehugger Robot
03db4fbbb7 Merge "Skip mount /oem on GSI" 2020-06-17 08:21:23 +00:00
josephjang
f829b2bc9f Identity: Add credstore
In order to support mDL on RVC, we need to
add credstore in /system/bin

Bug: 136506289
Test: atest VtsHalIdentityTargetTest
Change-Id: I7975eddde5b94edcd3a2d0e213244f84ffe43e8d
2020-06-16 14:04:00 +00:00
Jiyong Park
cd0c931b89 Merge "Organize product vars for adding properties" 2020-06-15 10:00:22 +00:00
Colin Cross
a1383d8f9d Use inclusive language in build/make
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
2020-06-12 21:10:55 -07:00
Colin Cross
8fae3c8472 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I12bbaf25876357f564829044b672f042240b2acf
2020-06-12 17:46:50 -07:00
SzuWei Lin
f8475cc49f Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
2020-06-12 16:25:44 +08:00
Treehugger Robot
2158d2ec6b Merge "Use inclusive language in build/make" 2020-06-12 03:19:02 +00:00
Yo Chiang
d0935e46f5 Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I0c7a1a306edb314e52bf3c50cfd6727b97889d04
2020-06-12 03:11:30 +00:00
Yo Chiang
2294009766 Merge "Remove default GSI libnfc-nci.conf" 2020-06-12 02:37:45 +00:00
TreeHugger Robot
d43c8c83bc Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: I203152b9d944247f5c30ec8a3d3800fa5cdddda1
2020-06-11 22:50:59 +00:00
TreeHugger Robot
0ffb2a8265 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev 2020-06-11 22:31:22 +00:00
Colin Cross
c3ad80467e Use inclusive language in build/make
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
2020-06-11 14:37:54 -07:00
Jiyong Park
eb49b34b1e Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from internal master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:35:23 +09:00
Jiyong Park
1ea01c5b24 Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:13:41 +09:00