Commit graph

124 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
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
Colin Cross
c3ad80467e Use inclusive language in build/make
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
2020-06-11 14:37:54 -07:00
Elliott Hughes
71e9c32390 Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6ec2 am: 534b035e29
Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: Ib72e06fd5b674606403bee352d3ddbd93d7430c7
2020-06-10 18:36:54 +00:00
Elliott Hughes
9b824d5ceb Remove TARGET_PREFER_32_BIT.
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: I2ff7793c8b1eb56f6be63375cc7b70aa44254443
2020-06-08 16:36:52 -07:00
Howard Chen
64b6535f43 Merge "Add tinyhostless to mainline_system.mk" am: c0ea7e89b8 am: 67a7b6d830
Change-Id: I3c37fbd4de8aa2e00918430fca0e154cb83330d5
2020-05-27 03:00:47 +00:00
Howard Chen
2f6bb93178 Add tinyhostless to mainline_system.mk
The tinyhostless module is provided by AOSP and is required by Mediatek
devices.

Test: build aosp_wembley-userdebug
Bug: 157109906
Change-Id: I2a1c4957c19fd4cbd60744d2d9cb534f19d3f239
2020-05-26 02:51:14 +00:00
Jeongik Cha
c8ba8c1b48 Move PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS to each devices(aosp targets)
Settings in aosp targets don't need to rely on static overlay.

Bug: 150820813
Bug: 152926806
Test: m
Change-Id: Ie41f881f1c48201db434605a03dbeb48149543b2
2020-04-30 06:34:41 +00:00
Jeongik Cha
a92ecd46cd Make RRO packages for system_ext
Until now, packages from system_ext don't create RRO packages, instead
it uses static overlay, but to make system_ext common, it should use
RRO.

Bug: 150820813
Test: m && check if there are RRO packages that use from system_ext apps
Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
Merged-In: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-04-20 13:59:52 +00:00
Jeongik Cha
d99e77d6d6 Make RRO packages for system_ext
Until now, packages from system_ext don't create RRO packages, instead
it uses static overlay, but to make system_ext common, it should use
RRO.

Bug: 150820813
Test: m && check if there are RRO packages that use from system_ext apps
Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-03-18 00:55:48 +00:00
Nikita Ioffe
18548cccc8 Don't inherit userspace_reboot.mk from mainline_system.mk
Test: Checked that userspace_reboot.mk is included in device makefiles
Test: build
Bug: 135984674
Change-Id: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
Merged-In: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
(cherry picked from commit 0f38beca94)
2020-01-30 00:11:11 +00:00
Nikita Ioffe
0f38beca94 Don't inherit userspace_reboot.mk from mainline_system.mk
Test: Checked that userspace_reboot.mk is included in device makefiles
Test: build
Bug: 135984674
Change-Id: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
2020-01-29 17:27:30 +00:00
Emilian Peev
23abbfeb4b Revert "Add libdepthphoto to mainline_system"
This reverts commit 55b9c1b651.

Reason for revert: "libdepthphoto" is no longer required or built
Bug: 132449311
Test: Successful build

Change-Id: Id2013f80dbc962f70ccb1b687c0dc18fef372348
2020-01-02 12:54:30 -08:00
Nikita Ioffe
1d0f32f6a6 Add userspace_reboot.mk and include it in mainline_system.mk
The intention of userspace_reboot.mk is to provide a default
configuration (e.g. userspace reboot watchdog timeout) for devices that
are supporting userspace reboot feature. So far it only contains one
property that tells whenever device supports userspace reboot, more to
follow in separate CLs.

Test: flashed blueline, checked that property is set to true
Bug: 135984674
Change-Id: I32e6281ccc36236ec4fa5cde299753b6e0ece181
2019-12-18 13:33:27 +00:00
Treehugger Robot
de5b0d2a73 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" 2019-12-17 04:57:10 +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
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
Tom Cherry
89eea96fe1 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot
Merged-In: I5aa0332e7f0e3fb6840b60e3d099c2b28d38b7ea
Change-Id: I5aa0332e7f0e3fb6840b60e3d099c2b28d38b7ea
2019-11-07 11:28:56 -08: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
Treehugger Robot
b410d98c0a Merge "Add libaudiohal to mainline system image" 2019-10-17 20:23:21 +00:00
Mikhail Naganov
4fc7e410fc Add libaudiohal to mainline system image
32-bit libaudiohal is used by 3rd party modules on the system
partition which get loaded by client apps. In the long term,
this dependency has to be eliminated, see b/142811260.

Bug: 141989952
Bug: 142811260
Test: vendor/google/build/build_test.bash
Merged-In: I41241922c7e48c5d8bf95363944932569cb20c0a
Change-Id: I41241922c7e48c5d8bf95363944932569cb20c0a
2019-10-17 12:36:42 -07:00
Steven Moreland
2ce54fa76a Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-11 20:19:13 +00:00
Steven Moreland
bf4fd54cee mainline_system: libhwbinder/libhidltransport
Bug: 135686713
Test: artifact whitelist requirement no longer complaining
Change-Id: Ia142f8e67c31f66f86386b65e009d4faee502c11
Merged-In: Ia142f8e67c31f66f86386b65e009d4faee502c11
2019-10-10 19:51:46 +00:00
Nikita Ioffe
b6eeae7289 Unconditionally install shim apex on system partition
Trying to do it on per-device basis is prone to errors and already
bitten us several times. For example, currently aosp_taimen doesn't
install shim apex on system partition, but specifies
ro.apex.updatable = "true", which means that it doesn't pass CTS tests.

Unconditionally installing shim APEX shouldn't introduce any problems
since apexd will skip its activation of devices that don't support
updatable APEX.

Test: m checkbuild
Bug: 140957666
Change-Id: I6b5e668b40b97752295c831684a7291842533c40
2019-10-07 12:14:08 +01:00
Yo Chiang
33b088d67f Enforce /system module RRO for mainline products
Turn on RRO enforcement for /system modules for products
that use mainline_system.mk

Bug: b/137727426
Test: compare_images
Change-Id: Ia1824481c85fb031d5e156307bf7a848e4721d9e
2019-10-02 18:44:11 +08:00
Justin Yun
ebe02d5fef Merge "Add platform hidl interfaces to mainline_system"
am: 6ae3aacab5

Change-Id: I9f03d3bd011127fd80ca126533d5664ebfd68edf
2019-08-27 20:52:14 -07:00
Justin Yun
bfe4a1c096 Add platform hidl interfaces to mainline_system
Core variant of some hidl interfaces must be included in
mainline_system explicitly because they have dependency with external
modules.

Bug: 138284120
Test: build mainline_system_arm64
Change-Id: I1893bb807429dbcacac3db3dcab2a830456775ea
2019-08-28 03:31:48 +00:00
Jiyong Park
09dcc68663 updatable_apex.mk is not inherited from mainline_system.mk
mainline_system.mk is inherited by not only Pixels but also products
like GSI and sdk_gphone where kernel isn't capable of supporting
updatable APEX.

Stop inheriting updatable_apex.mk from mainline_system.mk and let each
product to decide whether or not to inherit updatable_apex.mk.

Also, TARGET_FLATTEN_APEX is not set to true for GSI as it is the
default setting.

Bug: 132664085
Test: choosecombo 1 aosp_arm64 userdebug; get_build_var
TARGET_FLATTEN_APEX shows true
choosecombo 1 sdk_gphone userdebug; get_build_var TARGET_FLATTEN_APEX
shows true

Change-Id: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
Merged-In: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
(cherry picked from commit 5fd45bbeb0)
2019-07-02 13:38:23 +00:00
Anton Hansson
81c61780bb Merge "Move board config variable from mainline_system" am: bf95d43dc6
am: a17c7a1005

Change-Id: I1d945c577a363716f4389f05681c5d2c3ba22f07
2019-06-28 08:37:52 -07:00
Anton Hansson
8b527b3bea Merge "Remove lmk.log_stats sysprop from mainline_system" am: 6ce59eb4f6
am: 98b3c85628

Change-Id: Iceb8d73d09d297fd1b2e23350cca78ebe821beb1
2019-06-27 02:41:27 -07:00
Anton Hansson
c4f11be520 Move board config variable from mainline_system
This variable setting belongs in a board config, not
a product makefile.

Test: presubmit
Change-Id: I41e342ce841ec7aea69ff62aaefdc748cbf28d04
2019-06-26 18:07:05 +01:00
Anton Hansson
fd81f696ed Remove lmk.log_stats sysprop from mainline_system
It is now set on the /product partition by relevant devices.

Bug: 135569569
Test: lunch mainline_system_arm64; inspect system/etc/prop.default
Change-Id: I34696977f584a65741c6002e6688d86e66a1f121
2019-06-26 15:49:10 +01:00
Emilian Peev
64534babf3 Merge "Add libdepthphoto to mainline_system" into qt-dev
am: 02c434e887

Change-Id: I441933734a9d3f591c864688815c9e079c20aa63
2019-05-14 15:09:23 -07:00
Emilian Peev
55b9c1b651 Add libdepthphoto to mainline_system
Used by depth composite stream in camera
service.

Bug: 132173732
Test: make,
runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
-m testDynamicDepth
runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
-m testDepthOutputCharacteristics
runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/NativeImageReaderTest.java
-m testDepthJpeg

Change-Id: I1357f8ab09cdd9bc43317ea0d50537e1f9ef8d7a
2019-05-10 08:13:36 -07:00
Jiyong Park
9af722d59e Don't inherit updatable_apex from mainline_system
Camera on aosp_* targets are broken because they are inheriting from
updatable_apex.mk through mainline_system.mk. However, the kernels for
the targets on AOSP are too old to support updatable APEX. Temporarily
disabling updatable apex until when the kernels are updated from
internal master.

Bug: 131162245
Test: camera can be captured in aosp_crosshatch
Merged-In: Ibfef74db0769992266ebadf445836d2a183df3f7
Change-Id: Ia0beeb9523ade9bb8180034deb8ef0b01ee1c88b
2019-05-03 18:23:21 +00:00
Jiyong Park
519bd73006 Revert "Temporarily not inheriting updatable_apex.mk"
This reverts commit c5fc637c20.

Reason for revert: all Pixels (except pixel 1) are ready to support updatable APEX

Bug: 129035564
Test: run camera tests

Change-Id: Ib01a97db857ad928d875d244dcd0b3cac8e080ee
2019-04-26 05:43:22 +00:00
Jiyong Park
c5fc637c20 Temporarily not inheriting updatable_apex.mk
It broke camera.

Bug: 130652892
Test: m
Test: adb shell getprop ro.apex.updatable should return false or nothing
Change-Id: Id2df926e152411cb5d0bc4331cfd43e0dcd8ad6c
2019-04-17 16:21:36 +00:00
Jiyong Park
5645a3a9a0 Add updatable_apex.mk
The product abstracts configs that need to be set to support updating of
APEXes.

Bug: 130418467
Test: m
Test: adb shell getprop ro.apex.updatable in Pixel 2 and 3
Test: adb shell /system/apex/com.android.apex.cts.shim.apex exists.
Merged-In: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
Change-Id: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
(cherry picked from commit fa51bedf8b)
2019-04-17 16:18:56 +09:00
Jiyong Park
fa51bedf8b Add updatable_apex.mk
The product abstracts configs that need to be set to support updating of
APEXes.

Bug: 130418467
Test: m
Test: adb shell getprop ro.apex.updatable in Pixel 2 and 3
Test: adb shell /system/apex/com.android.apex.cts.shim.apex exists.
Change-Id: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
2019-04-15 20:34:18 +09:00
Anton Hansson
6f964f579d Add libdrm to mainline_system
Used by things on /product.

Bug: 130023865
Test: make
Change-Id: I564c6d823ac7e04d6a41dfd1ceb7074755b0bfd8
Merged-In: I564c6d823ac7e04d6a41dfd1ceb7074755b0bfd8
2019-04-12 11:55:20 +01:00
Anton Hansson
92c66b3daa Add libdrm to mainline_system
Used by things on /product.

Bug: 130023865
Test: make
Change-Id: I564c6d823ac7e04d6a41dfd1ceb7074755b0bfd8
2019-04-11 17:00:24 +01:00
Lajos Molnar
9d2acacd52 media: move com.android.media.swcodecs to base_system.mk.
This can now be supported on all devices.

Bug: 129710438
Change-Id: Ide0921361ce6b22655f6f5a2695fc892dbe47998
(cherry picked from commit 4609a369d4)
2019-04-04 19:06:40 +00:00
Anton Hansson
59b25b4dec Merge "Remove protobuf-cpp-full-rtti from mainline" am: 299d782ecd am: ce0f3e8510
am: 5c915e20b1

Change-Id: I583dab2825c3a7dfe39dc3b4a838fcba92e11608
2019-03-20 11:17:46 -07:00
Anton Hansson
3e69a4a52d Remove protobuf-cpp-full-rtti from mainline
It used to be depended on by something on /product, but this
is no longer the case.

Bug: 119619080
Test: build downstream users of mainline_system
Change-Id: Iabe1dbb45499b25295f741a62336cb86e4565d60
2019-03-20 13:03:42 +00:00
Dan Willemsen
3d05a08a6f Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
Merged-In: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-06 14:46:06 -08:00
Dan Willemsen
4a70a19f84 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-04 18:03:14 -08:00
Dan Willemsen
086f8f002c Revert "First pass at creating PRODUCT_HOST_PACKAGES"
This reverts commit 7218a21ed0.

Reason for revert: broke some side branches, and the mac build

Change-Id: Ifa52f2dbf9a383f69e07ba0aceb4742b05376364
Fixes: 125912305
2019-02-22 22:02:23 +00:00
Dan Willemsen
7218a21ed0 First pass at creating PRODUCT_HOST_PACKAGES
This only defines PRODUCT_HOST_PACKAGES as a concept, and requires that
it contain at least all of the files that would be installed to the host
from PRODUCT_PACKAGES (minus libraries, as those are expected to be
installed based on what's required by other modules).

It does not actually change what will be built, that will happen in a
future change.

Test: build/soong/build_test.bash
Change-Id: Ie502b1a483f821b957cfd407c31a93e243896dae
2019-02-20 12:58:37 -08: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