Commit graph

35 commits

Author SHA1 Message Date
Yo Chiang
6276066a02 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 11:00:28 +00: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
Anton Hansson
5f7c08fbb3 Remove stale artifact whitelist entries
Test: lunch mainline_arm64; m nothing
Change-Id: Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2
2019-08-20 12:17:06 +01:00
Anton Hansson
a4a23641ce Merge "Fix non-existing modules check" am: c1d0bfef47
am: 0796c70deb

Change-Id: Idb48fb89c275747e9997afe37796a0ed74693473
2019-06-26 03:14:49 -07:00
Anton Hansson
528fdc021f Fix non-existing modules check
This variable was accidentally changed to refer to the
shorthand PRODUCT_XYZ instead of PRODUCTS.<mk>.PRODUCT_XYZ
in a previous mass-migration, but that shorthand didn't
exist for these variables. Add it in.

Also whitelist the offender introduced since it was broken.

Test: lunch generic; m nothing
Change-Id: I29dd73c29796743e770afa0c2ceb4f8583dc6e1e
2019-06-25 21:52:58 +01:00
Anton Hansson
5d89ad8044 Merge "Remove non-existant packages from mainline_system" am: 76d8591417 am: 68028611f0
am: 1d1725d7eb

Change-Id: Iffa203bc5a893e89467a76782a8759bf46679844
2019-02-08 06:48:16 -08: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
90bd77071e Merge "Move mainline_arm64 over to use mainline device" am: ad9ee4b504 am: 2b219b051f
am: bd57a28943

Change-Id: I415e70e6e42eb0ccf11fdca8a8205965f1795af5
2019-01-28 03:07:58 -08:00
Anton Hansson
ad9ee4b504 Merge "Move mainline_arm64 over to use mainline device" 2019-01-28 10:49:32 +00:00
Anton Hansson
b4bb4308d9 Merge "Move PrintRecommendationService back to handheld_system" am: 673cbcd6f8 am: 6529ac841a
am: 67014e8f4a

Change-Id: I3bb0ba3a185ee6fe8cb25304b94927d15d23a6fe
2019-01-25 08:31:50 -08:00
Anton Hansson
14fb72c15c Move mainline_arm64 over to use mainline device
Possible now that it has TARGET_COPY_OUT set for vendor and
product.

Update the whitelist too.

Bug: 120974093
Test: make
Change-Id: I99eb718f5f4e79b9224a4079f2ff4595cd2b7ae2
2019-01-25 11:29:26 +00:00
Anton Hansson
dca5c961a2 Move PrintRecommendationService back to handheld_system
This app is not intended to be moved to /product.

Bug: 122353713
Test: lunch mainline_arm64; m nothing
Change-Id: I65464975a77e187591b3e2de2521f1b2876b5abf
2019-01-25 11:14:47 +00:00
Anton Hansson
3c19cb6de5 Merge "Add webview to mainline whitelist" am: 3fc20bd7d9 am: e360c96bc2
am: ba02d77619

Change-Id: I0e5bc4dd361cbc66126d57555689ff2c051fc9dd
2019-01-16 08:53:34 -08:00
Anton Hansson
3fc20bd7d9 Merge "Add webview to mainline whitelist" 2019-01-16 16:31:50 +00:00
SzuWei Lin
caa5e88d4a Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-16 22:23:35 +08:00
Anton Hansson
0a5d5fec2e Add webview to mainline whitelist
The app will move to product soon, but temporarily
whitelist that mainline_arm64 adds it to /system.

Test: make
Change-Id: I7b0ce5623a160bcb0f8b89f3053a007019ff0b62
2019-01-16 13:31:02 +00:00
SzuWei Lin
2ccd37eeb3 Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-15 17:37:57 +08:00
Anton Hansson
0909191b82 Merge "Move overridden AOSP modules out of *_system mks" 2019-01-08 16:20:47 +00:00
Anton Hansson
dced84f9ec Merge "Move overridden AOSP modules out of *_system mks" 2019-01-08 12:54:10 +00:00
Anton Hansson
14ef5cc4da Merge "Add mainline.mk" am: 64bf2593f0 am: 082a87e4dc
am: a39232ae43

Change-Id: Id13049c87d2457b2587e9aae236d39446b4ef335
2019-01-08 04:12:19 -08:00
Anton Hansson
811f2392c0 Move overridden AOSP modules out of *_system mks
All these modules are to be moved to /product, as they are not
part of the core system image. Move them out of the _system mks
as a start, and temporarily whitelist them so that they can be
moved iteratively.

Bug: 122353713
Test: make
Change-Id: If658e6b4565924cd915a183400c5b2b32984eca4
Merged-In: If658e6b4565924cd915a183400c5b2b32984eca4
2019-01-08 10:03:58 +00:00
Anton Hansson
746bcc91cf Move overridden AOSP modules out of *_system mks
All these modules are to be moved to /product, as they are not
part of the core system image. Move them out of the _system mks
as a start, and temporarily whitelist them so that they can be
moved iteratively.

Bug: 122353713
Test: make
Change-Id: If658e6b4565924cd915a183400c5b2b32984eca4
2019-01-08 09:46:31 +00:00
Anton Hansson
fdc3203ef0 Add mainline.mk
Contains mainline_system and the relevant AOSP packages for the
other partitions. Intended to be inherited by the aosp_X variants
of mainline devices.

Bug: 118826166
Test: build mainline_arm64
Change-Id: I7d1953bf5ccda4d9652dca4d32efb75b31015342
2019-01-07 16:49:29 +00:00
Anton Hansson
acb3084aa2 Allow mainline_arm64 to have product contents
The device currently targeted does not have a product partition.
Adding product-specific apps to it therefore trips up the artifact path
check for /system.

Workaround that by whitelisting /system/product/% for now. This should
be removed when the device has the right partitions.

Bug: 110072687
Test: build mainline_arm64
Merged-In: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
Change-Id: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
2018-12-18 14:34:29 +00:00
Anton Hansson
a2946913ed Allow mainline_arm64 to have product contents
The device currently targeted does not have a product partition.
Adding product-specific apps to it therefore trips up the artifact path
check for /system.

Workaround that by whitelisting /system/product/% for now. This should
be removed when the device has the right partitions.

Bug: 110072687
Test: build mainline_arm64
Change-Id: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
2018-12-18 09:57:45 +00:00
Anton Hansson
e08726451a Merge "Add vendor restrict to mainline targets" am: 41ec0a65a4 am: e046848327
am: 3899ce5a49

Change-Id: I0e33357b0376c5db57a1e9836a8e4bfc0b479f52
2018-10-30 01:10:23 -07: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
Chong Zhang
45a6fee77d Add mediaswcodec to system
bug: 111407413
Change-Id: If506a9a5b0d8eb004c802dc056cf6fd4f830a212
2018-10-05 13:35:23 -07:00
Anton Hansson
889018d3d6 Include AOSP telephony apps in mainline_system.
These apps are included on all mainline devices. Including them
necessitates splitting telephony.mk into two pieces, as "rild"
installs on /vendor.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Id4f1684604c71e853c8096e9a6992e65b6dfefed
2018-09-26 16:28:13 +01:00
Anton Hansson
1b66873130 Fix vendor include in mainline_arm64.
Include all the _vendor equivalents of the mk's included by
mainline_system. The previous include was a typo.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I71cf6509ad67ed28908716356228ef3980823bf6
2018-09-26 16:28:06 +01:00
Tao Bao
453b4ddcc4 Revert "Whitelist system/lib64/libminadbd_services.so for recovery image."
This reverts commit ba3a54b2c4.

Bug: 112318375
Test: `build/soong/build_test.bash --dist` with the matching recovery CL
      in the topic.
Change-Id: I35e27120fd62884cbb18f4af7315cad1be080ffd
2018-08-07 20:50:29 -07:00
Tao Bao
ba3a54b2c4 Whitelist system/lib64/libminadbd_services.so for recovery image.
Bug: 112318375
Test: `build/soong/build_test.bash --dist` passes.
Change-Id: I4abb70ae45e33d944859741f079203807a3c8ea6
2018-08-07 16:49:31 -07:00
Anton Hansson
9fbe84ceee Move dep on PRODUCT_COPY_FILES to main.mk
Prior to this change the product-installed-files macro didn't include
PRODUCT_COPY_FILES, which is a problem for the artifact path
enforcements. Fix this by moving the dep on PCF into main.mk.

Leave the declaration in Makefile for now.

Test: diff modules_to_install before and after
Bug: 80410283
Change-Id: Ie7ecd5a963aedd2c573f4fe46d327829908aec03
2018-07-13 17:16:22 +01:00
Anton Hansson
3f1ff094f4 Fix mainline_arm64.
This target was added over night, whitelist it for now.

Test: make
Change-Id: I2235dcc7a3e62e1b0091e43829c519b03c2455a4
2018-06-29 12:11:38 +01:00
Anton Hansson
cf27a3da33 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_arm64: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm64: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm && m nothing && lunch mainline_system_arm && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:27:08 +01:00