Commit Graph

38 Commits

Author SHA1 Message Date
JaeMan 20cdc90938 Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.

First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.

These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.

Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
2020-08-13 07:39:30 +00: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
SzuWei Lin 283dc8ced5 Add Legacy GSI R
Legacy GSIs named with the suffix _ab, ex. aosp_arm64_ab.
It contain some backward-compatible configurations for
devices upgraded from O/O-MR1.

The patch also addes legacy_gsi_release.mk for the special
configuretions of Legacy GSI.

Bug: 144742991
Test: boot aosp_arm64_ab-userdebug on a walleye P (with SPL)
Test: boot aosp_arm64_ab-userdebug on a walleye Q (with SPL)
Change-Id: I61c9e74abcc921ab2cb50bf6f6dce1097a8d6c77
2020-01-20 17:49:45 +08:00
SzuWei Lin 1b4eaef865 Phase out Legacy GSI and gsi_common.mk
The Legacy GSI is used on O/O-MR1 devices.
Do not need to support anymore. Phase out it.

Bug: 135977699
Test: none
Change-Id: I48b563a3aceca3c926e744165eb1dd88eff7a3d2
Merged-In: I48b563a3aceca3c926e744165eb1dd88eff7a3d2
2019-09-20 10:48:12 +08:00
SzuWei Lin 323be83a66 Enable mainline checking for all GSI targets
There are some makefile inherit from aosp_$arch*.mk. This patch
change to only enable mainline checking on excat GSI targets,
such as aosp_$arch or aosp_$arch_(a|ab), and does not apply on
the child targets.

This patch also add some more whitelist items to gsi_common.mk

Bug: 123613261
Test: aosp_arm64-userdebug build pass
Test: remove some whitelist items and aosp_arm64-userdebug build fail
Test: sdk_phone_arm64-eng build pass
Test: gsi_arm64-userdebug build pass
Change-Id: I1772a55ab823a0312b9f215f0d2c3b0c727c8e4b
2019-02-01 15:30:28 +08:00
SzuWei Lin f6f5d8ad09 Change Legacy GSI to inherit from gsi_common.mk
The patch change Legacy GSI (aosp_$arch_(a|b)) to inherit from
gsi_common.mk instead of treble_common.mk

It does not inherit from gsi_common.mk directy. The patch adds
legacy_gsi_common.mk to extend gsi_common.mk, and all Legacy
GSI inherit from legcay_gsi_common.mk.

The patch also removed treble_common*.mk.

Bug: 119747870
Test: flash aosp_arm64_ab-userdebug on blueline P
Test: flash aosp_arm64_ab-userdebug on walleye O-MR1
Change-Id: If54760484cc0937719c1336f1a4caac8468d2009
2019-02-01 11:29:02 +08:00
SzuWei Lin 1457b3fcbf Refactor GSI BoardConfig.mk
The patch modifies the Legacy GSI to use BoardConfigGsiCommon.mk
instead of board config treble-common*.mk, and delete these
treble-common*.mk files.

After the patch, the GSI common board configs are in single file
BoardConfigGsiCommon.mk

The patch also includes:

- Moving `TARGET_COPY_OUT_VENDOR := vendor` to
  BoardConfigGsiCommon.mk, because GSI always contains no vendor
  contents.
- Configure the binder interface bitness explicitly.
- Unify the structure of each BoardConfig.mk.

Bug: 122282239
Test: compare the out folder between with and without the patch
Test: output files are all the same
Change-Id: Ie5901446920dda317dea848e6d5a7bbcf10a32cf
2019-01-08 17:35:05 +08:00
SzuWei Lin 0472eec62c Add A/B update to GSI
The feature should work fine on the devices with partition _a and _b.
and will not be enabled on the devices without partition _a and _b.

Bug: 110763858
Test: build aosp_arm64-userdebug and aosp_arm64_ab-userdebug
Change-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
Merged-In: I9f783dd6fe69eff2536a6aac0506e41c724510b2
2018-07-20 06:59:14 +00:00
SzuWei Lin 558f3dd79b Revise GSI to inherit from aosp_base.mk and telephony.mk
GSI inherited from aosp_base_telephony.mk, but it included some settings for
emulator. So this patch changes to inherit from more pure makefiles to
includes AOSP and telephony modules.

Bug: 65332895
Test: Test on some Pixel devices with GSI, boot to home screen
Change-Id: I98523e864ccf06ddba4422bc8380bc6ff0095d5a
2017-09-06 17:05:08 +08:00
SzuWei Lin 2999f29ea0 Move common 32/64 bits product settings to another files
Move the common 32/64 bits product settings from aosp_xxx.mk to

    target/product/treble_common_(32|64).mk

The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.

Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
2017-08-14 18:09:49 +08:00
Bowgo Tsai 952f6a458e Removing vboot 1.0 verity metadata
The generic system.img shouldn't contain any specific verity metadata
because we don't mandate how to do verified boot. Plus, OC-DR devices
use AVB instead of vboot 1.0.

Bug: 62647718
Test: Boot a DR device with the generic system.img
Change-Id: I0966d88d4512621cce7b8abdc28a90a6e312a391
2017-06-27 18:13:56 +08:00
SzuWei Lin 6fdff23df2 Normalize building generic system image with treble-common.mk
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.

The common part inclueds:

- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configurations

Bug: 37927875
Test: boot to home screen with the generic system image
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
2017-06-13 03:15:39 +00:00
Vijay Venkatraman ae432837c7 Merge "Replaced android.dvr.composer@1.0 with android.frameworks.vr.composer@1.0" into oc-dev am: f4c0009bf9
am: 2ad9b943fd

Change-Id: I7997309f7989967144f54b2eb3717b5b9a9fb4d0
2017-05-18 21:49:09 +00:00
Vijay Venkatraman 2ad9b943fd Merge "Replaced android.dvr.composer@1.0 with android.frameworks.vr.composer@1.0" into oc-dev
am: f4c0009bf9

Change-Id: Ifa5785c6a718313408abf8b333e6978e2989a058
2017-05-18 21:32:21 +00:00
Jaesoo Lee 1b6723497a configstore: build configstore 1.1 instead of 1.0
configstore is uprevisioned to 1.1.

Bug: 37727469
Test: Build and tested on sailfish

Change-Id: I21861448a5d607383b617f2f85bd378013e64090
2017-05-17 14:08:52 +09:00
Vijay Venkatraman c1319fec67 Replaced android.dvr.composer@1.0 with
android.frameworks.vr.composer@1.0

Bug: 38349320
Test: build aosp_arm64_ab
Change-Id: Iaf4c5065bbd10763258dad3e65b69bffa8f94194
2017-05-16 21:58:14 +00:00
Steven Moreland 2b0022809d Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I2f13ad8151deff77850c4e18f6c84e2e55ba52d3
(cherry picked from commit c96c1de869)
2017-05-04 21:55:43 +00:00
Steven Moreland c96c1de869 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I2f13ad8151deff77850c4e18f6c84e2e55ba52d3
2017-05-04 13:16:17 -07:00
Steven Moreland 0caf69d72d Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I69f280c36533ce13d5f3b3f2b2eb8d969982cb50
(cherry picked from commit b586105307)
2017-05-04 15:24:51 +00:00
Steven Moreland b586105307 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I69f280c36533ce13d5f3b3f2b2eb8d969982cb50
2017-05-03 11:12:53 -07:00
Jaesoo Lee 41e5dff370 fixed build errors for aosp generic system image
Following files are missing in AOSP and not needed
- device/google/marlin/init.recovery.common.rc
- vendor/google/products/marlin/bootanimation-1440-256col.zip
- vendor/google/certs/devkeys/devkey

Bug: 37259658
Test: built systemimage and tested it work with other sailfish images
Change-Id: I95e180b6adbe8d08348794fd6b5f41e810999aea
2017-04-17 12:33:02 +09:00
Jaekyun Seok 0d16dd1942 Remove resource overlay
Test: building succeeded and tested with sailfish vendor image.
Bug: 36231603

Change-Id: I5d2d6d882ef3fc8a807a8b0ecd2f59f8a4a03e1f
2017-04-12 18:35:19 +09:00
Esteban Talavera deb26ad395 Revert "Remove resource overlays"
This reverts commit 1dcf689c3b.

The CL broke git_master/sailfish-userdebug_P and oc-release/marlin_svelte

Bug: 36231603
Test: "make" works again for oc-release/marlin_svelte after reverting both CLs from this topic

Change-Id: I861b8b11c29293fb4a0c746768c03bc4eb986807
2017-03-28 17:02:20 +01:00
TreeHugger Robot 0b1e95f08b Merge "Remove resource overlays" 2017-03-28 01:02:54 +00:00
Jiyong Park d68246c8e4 Remove mailin/sailfish fstab from the generic system image
fstab files are now in /vendor/etc. No need to have it in system.

Bug: 36229492
Test: aosp_arm64_ab should boot in sailfish/marlin
Change-Id: I9ced5361ce3e3a98722d45124ee58d4411f06273
2017-03-27 15:46:34 +09:00
Jaekyun Seok 1dcf689c3b Remove resource overlays
Test: building succeeded and tested on sailfish and marlin with
http://ag/2009238.
Bug: 36231603

Change-Id: I82d672cbdca3b8597de71c821df8fb92f27318f3
2017-03-27 14:52:57 +09:00
Jiyong Park 06241051e8 Make telephony work on generic system image
Bug: 36070427
Test: modem is up and emergency call can be made
Change-Id: Ic09200943a7ae7c51e420c6485f3b1b95c702265
2017-03-24 08:47:47 +00:00
TreeHugger Robot e496c6a76f Merge "Add libion to the generic sytem image for camera" 2017-03-24 07:56:57 +00:00
TreeHugger Robot 75187d0d8e Merge "Add wifi support to the generic system image" 2017-03-24 07:51:34 +00:00
Jiyong Park a14bf425f7 Add libion to the generic sytem image for camera
Camera HAL is using libion. I believe libion is generic library, so put
it in this generic system image.

Bug: 36043196
Test: make, flash and check that libion.so is in /system/lib.
Change-Id: I2e6b68e5899e27c603476ad7c5cd64f3cd5a8c53
2017-03-24 06:29:02 +00:00
TreeHugger Robot 74922e8dfb Merge "Remove dependency on marlin sepolicy" 2017-03-23 22:30:19 +00:00
TreeHugger Robot c003af00a1 Merge "Remove media config file copy rule" 2017-03-23 20:14:37 +00:00
Diego Wilson f4efd73e96 Remove dependency on marlin sepolicy
Now that the selinux policy has been split between the system and
vendor partitions the aosp_arm64_ab build variant no longer
depends on the marlin selinux policy to work on marlin and sailfish.

Test: build and flash aosp_arm64_ab system.img on marlin and sailfish
Change-Id: I7681207284d783ffca1acccf44dbb159ea3b521c
2017-03-23 13:30:04 -04:00
Diego Wilson 70251beb44 Add libaudioroute.so to aosp_arm64_ab
libaudioroute.so is required in the system.img
in order for audio to be functional.

Test: hear tones on dialer in marlin and sailfish
Change-Id: I477aff9d041a8c60c88e7c74aab3b6802d43724f
2017-03-22 11:12:21 -07:00
Jiyong Park 3e213c849b Add wifi support to the generic system image
Added wifi-related packages (except those not generic such as
wpa_supplicant) to the generic system image.

Bug: 36015569
Test: Wifi works with this generic image on sailfish.

Change-Id: Ib4d07facd4eb1ca0f375d9135a75b892d0ef80a4
2017-03-22 02:20:34 +00:00
Diego Wilson bc372ec3ec Add libdynamic_sensor_ext to aosp_arm64_ab
This library was added as a dependency of the
sensors HAL.

Test: build and load aosp_arm64_ab on sailfish and marlin.
Change-Id: Iaa413d3572ec12e1f022539a5ade1f3c2d793999
2017-03-20 13:02:53 -07:00
Jaekyun Seok a7e65dbf90 Remove media config file copy rule
ag/1923309 and ag/1918350 have already moved them into vendor
partition.

Test: building succeeded.
Bug: 35653062
Change-Id: Idcf1b481fb043867bb64ff7c63800c44a151f32d
2017-03-16 17:48:41 +09:00
Jiyong Park 38f8aacf3b Add aosp_arm64_ab for generic system image for A/B-ready devices
aosp_arm64_ab is added as a product to build a generic system image for
all devices with ARM64 and A/B ready partitions. For now, it only
supports sailfish/marlin devices because following items are not yet
split.

- fstab
- overlays
- sepolicy

Bug: 35653062
Test: build and flash it to sailfish (or marlin)

$ source build/envsetup.sh; choosecombo 1 sailfish userdebug
$ ENABLE_EARLY_MOUNT=true ENABLE_TREBLE=true m -j 80
$ fastboot flashall
(For now, the two ENABLE_* are required to install  *.rc and *.prop
files into vendor partition. This restriction will be removed in the
future.)

$ source build/envsetup.sh; choosecombo 1 aosp_arm64_ab userdebug
$ m -j 80 systemimage
$ fastboot flash system out/target/product/generic_arm64_ab/system.img
$ fastboot -w reboot

Change-Id: Ia91163f2d51e90a488c9451cba23242887ea82ba
2017-03-09 17:14:37 +09:00