Commit graph

25 commits

Author SHA1 Message Date
JaeMan
6f16b5764b 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
2020-08-12 10:10:40 +00:00
Yifan Hong
5cada34232 Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f am: 76a337f65e am: d0942b4b7a am: b77b9c30a6
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I5e7e96b60fb8ed628f501a55aef8b7048254f109
2020-07-17 23:33:25 +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
Yifan Hong
87a35a1063 Add vendor_dlkm partition. am: cfb917a1c7 am: 58af66905e am: 9fce02b625 am: 93cc57e0cd am: 658ff49409
Original change: https://android-review.googlesource.com/c/platform/build/+/1316438

Change-Id: I73a7a77a024c127bb424d41390556069a85982c2
2020-07-14 20:36:21 +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
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
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
Yo Chiang
8c1290cbd5 Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Merged-In: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
2019-10-31 10:56:49 +00:00
Yo Chiang
2ccc153d42 Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
2019-10-31 14:57:35 +08:00
Justin Yun
666b2208cc Merge "Add zygote init script to mainline_system.mk" am: e8d9df122a am: 7b33d3bcc0 am: 5f4ae378ef
am: 6972e648be

Change-Id: I57dbb5720925c74eaad79e1a382948d52f0c84ff
2019-10-29 00:06:21 -07:00
Justin Yun
5f4ae378ef Merge "Add zygote init script to mainline_system.mk" am: e8d9df122a
am: 7b33d3bcc0

Change-Id: Iffd2165060f44b303756d9ab0befc0858bb2d80a
2019-10-28 23:52:56 -07:00
Justin Yun
c0b883fe77 Add zygote init script to mainline_system.mk
We may add all possible scripts to "root" to clean up the whitelists
of mainline devices.
One of the zygote init scripts is selected by "ro.zygote" property.

Bug: 143121605
Test: build test for all device targets
Change-Id: I4435f1c48a306c3a8d42522ed780d405a32780b4
2019-10-28 14:31:24 +09:00
Yo Chiang
036d91d723 Merge "Enable mainline checking for mainline_system_arm64" am: efd0d2da0f am: ee69213ce1 am: ae27edc14f
am: b0f465c501

Change-Id: If0a386a8c6abaab5a46bf17803d42874c14e4194
2019-10-01 03:03:33 -07:00
Yo Chiang
ae27edc14f Merge "Enable mainline checking for mainline_system_arm64" am: efd0d2da0f
am: ee69213ce1

Change-Id: Ib4625afb59559935478764e1f7d5d59a8a78e71a
2019-10-01 02:52:01 -07:00
Yo Chiang
b58789b5b1 Enable mainline checking for mainline_system_arm64
Ensure only /system partition modules defined in mainline_system.mk is
included.

Test: lunch mainline_system_arm64-userdebug; m
Change-Id: I0cf9e28dd95fdc0f8f1eb88aefa07e230223b996
2019-10-01 14:36:11 +08:00
Colin Cross
9472ff8ac4 DO NOT MERGE - temporarily disable vendor file check for mainline
am: c41a28cb1c

Change-Id: I21f7a4636712ac65c4af50cf563b0db55a96800c
2019-08-09 10:30:28 -07:00
Colin Cross
c41a28cb1c DO NOT MERGE - temporarily disable vendor file check for mainline
We want to use prebuilts for apex modules for qt-*-dev, but it is
running afoul of the vendor file check.  Disable the check for
now until we figure out a better solution.

Bug: 136664286
Test: Local build and Forrest Run
Change-Id: I9db5cb227780ede6aaff0070cd2fd59e95e635e6
2019-08-07 07:00:06 -07:00
Justin Yun
6151e3f1ea Rename product_services to system_ext
Bug: 134359158
Test: build and check if system_ext.img is created
Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-07-09 08:57:19 +00:00
Anton Hansson
07fa9b13b4 Make mainline_system_arm64 build only /system
Configure this product not to build any of the other partitions.

Note that the only partition that currently has artifacts produced
is system_other, and this change doesn't appear to prevent odex/vdex
files from being created there anyway. However, it does allow
configuring the target device (mainline_arm64) to have more partitions
in a followup change.

Bug: 111533333
Test: make
Change-Id: Ib115cb03bc99b9b61e0d6f1b622784e7ad5fcea0
2019-03-22 14:07:49 +00:00
Anton Hansson
c8df56f35e Remove non-existant packages from mainline_system
Also add the health-check macro to the buildable products
to make sure no other non-existant packages are added.

Bug: 80410283
Test: build mainline_arm64 + mainline_system_arm64
Change-Id: I6c54de2f43b5ab0c9e0ddfa09fa7553c321e4aa7
2019-02-08 08:08:52 +00:00
Anton Hansson
41ec0a65a4 Merge "Add vendor restrict to mainline targets" 2018-10-30 07:43:55 +00:00
Anton Hansson
123f8e73ed Add vendor restrict to mainline targets
Prevents additions of non-aosp artifacts to these products.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id12a77bd7f4cc9917aecbca76e8a2842d7c77613
2018-10-29 16:25:49 +00:00
Anton Hansson
284b81c1ae Add a mainline arm64 device
The existing 'generic' targets are emulator devices, and targeting
it has the side-effect of including emulator-specific artifacts.

Create a mainline device instead, which is really generic. This also
allows specifying tweaks unsuitable for the emulator.

Include BoardConfigGsiCommon for now, even though it includes a few
things we likely won't want in the future.

Bug: 80410283
Bug: 111538404
Test: lunch mainline_arm64; m
Change-Id: I15e7cb41fcbd3c0592a091ba7a8575ddf10bda71
2018-10-29 16:15:04 +00:00
Anton Hansson
c0c39cf270 Add some experimental mainline targets.
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.

- mainline_system: base mk for mainline systemimage. It will evolve to
  inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm64 && m nothing && lunch mainline_system_arm64 && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
Merged-In: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:28:24 +01:00