Commit graph

105 commits

Author SHA1 Message Date
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
Anton Hansson
ed5f6646b0 Remove DMService from mainline_system
Doesn't exist in AOSP.

Bug: 110072687
Test: make
Change-Id: I516ff4d647e62b8535e9bf648a156b010a328e93
Merged-In: I516ff4d647e62b8535e9bf648a156b010a328e93
2019-02-08 08:08:46 +00:00
Anton Hansson
64179cca6d Merge "Remove DMService from mainline_system" 2019-02-07 08:43:47 +00:00
Steven Moreland
890f9324f6 Merge "mainline_system -= ...tests.libhwbinder@1.0-impl" am: 7bd8753381 am: 7a61e48691
am: 41919a7998

Change-Id: I55fd8d0363aaad37c0ffad5e543b8a6a75049d3d
2019-02-06 10:57:33 -08:00
Steven Moreland
5bc1844b2a mainline_system -= ...tests.libhwbinder@1.0-impl
Tests are configured to load this statically now.

Fixes: 122456128
Test: libhwbinder_benchmark, hwbinderThroughputTest, libhwbinder_latency
Change-Id: I5cd53642d8b6ddb85e79fd231280b9d26ce3ee35
2019-02-01 01:56:29 +00:00
Anton Hansson
51e82f87d7 Remove DMService from mainline_system
Doesn't exist in AOSP.

Bug: 110072687
Test: make
Change-Id: I516ff4d647e62b8535e9bf648a156b010a328e93
2019-01-29 09:25:09 +00:00
Anton Hansson
ee25fc7a63 Merge "Add recovery_refresh to mainline_system" am: 8fbdd25457 am: 628e7ff762
am: b5ca00950b

Change-Id: I3555941bb1840ed400ccfb786695239da14f5d87
2019-01-28 03:07:00 -08:00
Anton Hansson
91fddbbd95 Add recovery_refresh to mainline_system
Needed by recovery on devices without a cache partition.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I71fd35022b0928016f6767cea35971ce14bf03fe
2019-01-25 11:27:27 +00:00
TreeHugger Robot
267a15129b Merge "Load sw C2 codecs from apex" 2019-01-16 03:05:37 +00:00
Chong Zhang
dfdf978f58 Load sw C2 codecs from apex
Replace the C2 entrypoint lib with apex.

bug: 111407413
Change-Id: I7b118f69219f143d55560ec824dd93066da8c842
2019-01-10 02:08:07 +00:00
Anton Hansson
0fed3cf513 Merge "Add adb_keys to mainline_system if they exist" am: 3a4a966507 am: 83d2837f4b
am: 01193c8f4c

Change-Id: Ib392eca3ff1627b96ed6a7ce138abad07d418e8c
2019-01-08 04:14:05 -08:00
Anton Hansson
3a4a966507 Merge "Add adb_keys to mainline_system if they exist" 2019-01-08 11:40:25 +00:00
Ahmed ElArabawy
69e62af873 Wifi: Add Wifi library to mainline_system
This commit adds android.hardware.wifi@1.0.so to mainline_system.

Bug: 122363107
Test: Successful build
Test: lunch crosshatch-userdebug ; make -j64
Test: lunch mainline_system_arm64; make -j64
Change-Id: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
Merged-In: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
(cherry picked from commit b38ce5a6ff)
2019-01-08 09:24:48 +00:00
Ahmed ElArabawy
b38ce5a6ff Wifi: Add Wifi library to mainline_system
This commit adds android.hardware.wifi@1.0.so to mainline_system.

Bug: 122363107
Test: Successful build
Test: lunch crosshatch-userdebug ; make -j64
Test: lunch mainline_system_arm64; make -j64
Change-Id: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
2019-01-07 08:57:06 -08:00
Anton Hansson
0cb36d7bbc Add adb_keys to mainline_system if they exist
Similar to I1720644d89ec5289fbe99f95ebcdfbb3f3b20e67,
but for mainline_system. This reduces the diff between
full_base.mk and mainline_system, a step on the way to
get aosp_blueline inheriting mainline_system.

Bug: 118826166
Test: make
Change-Id: I52bfe5dfb3e1a22db2d46fe9d1f372ee25533fdd
2019-01-07 14:36:12 +00:00
Anton Hansson
7bd6935ba3 Merge "Add a languages_default.mk" am: 14fc7361b9 am: a8345dff8a
am: 987412cb00

Change-Id: I25cc2a0b07061cfdf78a4dd7cadc80012c6f5a57
2019-01-07 03:00:46 -08:00
Anton Hansson
0fc8fd99a8 Merge "Remove km_MH locale from mainline" am: 47ca8d0a73 am: 49cd6c9c0e
am: 885f6c1081

Change-Id: I5049fb12135e8e37a19732b2779e40639e6edf69
2019-01-07 02:59:48 -08:00
Anton Hansson
14fc7361b9 Merge "Add a languages_default.mk" 2019-01-07 10:32:25 +00:00
Anton Hansson
47ca8d0a73 Merge "Remove km_MH locale from mainline" 2019-01-07 10:31:52 +00:00
Anton Hansson
2110e47a90 Merge "Add Tag to mainline_system" am: ad68902d5a am: aa02046b93
am: 6ae671edd1

Change-Id: I19e26b41f1d6360d358b0f1dae23b3c88656aaac
2019-01-04 08:57:51 -08:00