Commit Graph

5655 Commits

Author SHA1 Message Date
Tianjie Xu 526b8563a5 Merge "Stop creating update_engine_payload_key" 2019-10-17 20:59:51 +00:00
Mikhail Naganov 4c086e7be7 Merge "Add libaudiohal to mainline system image"
am: b410d98c0a

Change-Id: Ia274b609cd60db0c86c257e4967ef37cfa5d1c63
2019-10-17 13:39:48 -07:00
Treehugger Robot b410d98c0a Merge "Add libaudiohal to mainline system image" 2019-10-17 20:23:21 +00:00
Josh Gao 0ad32182a0 Merge "Move remount to PRODUCT_PACKAGES_DEBUG."
am: 7228fcf19a

Change-Id: I40733d1cf74d6fdb19c3b5abea214cef8726b6ec
2019-10-17 13:15:00 -07: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
Josh Gao 7228fcf19a Merge "Move remount to PRODUCT_PACKAGES_DEBUG." 2019-10-17 19:14:26 +00:00
Jooyung Han 7701ecb0a4 Merge "Revert "install VNDK APEX instead of VNDK libs""
am: e925923af3

Change-Id: I6033c86172e87b1fabfc1a86967f7995f640694f
2019-10-17 05:07:58 -07:00
Treehugger Robot e925923af3 Merge "Revert "install VNDK APEX instead of VNDK libs"" 2019-10-17 11:50:47 +00:00
Inseob Kim ba36f4c139 Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full"
This reverts commit 9856889381.

Reason for revert: The fix aosp/1145211 has been merged.

Change-Id: I70b37bbee69ac3df6a603e2641f52f6025fb9584
2019-10-17 10:30:35 +00:00
Jooyung Han 376c613085 Revert "install VNDK APEX instead of VNDK libs"
This reverts commit 172c8e6de0.

Reason for revert: some targets are broken

Bug: 142773030
Change-Id: Ic35b19c7973946658365ecd7de4846f3175054b5
2019-10-16 23:45:38 +00:00
Tianjie Xu 2df23d7f41 Stop creating update_engine_payload_key
Now the update_engine is able to read public keysfrom otacerts directly.
So the update_engine_payload_key is no longer needed.

Also remove the key replace in sign_target_files_apks.py. So we should
not use the new script to sign the old target files.

Bug: 116660991
Test: build the system image, unit tests pass
Change-Id: I9dae1f8b397f2b5efafed66a8faac1cb9087c741
2019-10-16 18:27:22 +00:00
Lev Proleev d67cdd3bd2 Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
Merged-In: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
(cherry picked from commit fde53f4e3e)
2019-10-16 14:00:40 +01:00
Martin Brabham a42177adc4 Merge changes Ie9de9576,I14f7cd06
am: 14fcfb8a9a

Change-Id: I9d8688f9681a5821d91c5e1b4105fc6a67cd5c40
2019-10-15 15:15:30 -07:00
Martin Brabham 14fcfb8a9a Merge changes Ie9de9576,I14f7cd06
* changes:
  Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full
  Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
2019-10-15 21:50:42 +00:00
Jooyung Han 97684d7a89 Merge "install VNDK APEX instead of VNDK libs"
am: 75d8a47039

Change-Id: Ic560981bf41a5da9f084f6c26d21041174b4b2e3
2019-10-15 02:43:30 -07:00
Jooyung Han 75d8a47039 Merge "install VNDK APEX instead of VNDK libs" 2019-10-15 09:21:19 +00:00
Inseob Kim 9856889381 Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full
This temporariliy turns off treble sysprop neverallow rules which
enforces marking the owner and accessibility to each system property.

Bug: 131162102
Bug: 142684203
Test: m sepolicy_tests
Change-Id: Ie9de9576fcf28c432543ab8f8971c1d048c55819
2019-10-15 17:32:10 +09:00
Jooyung Han 172c8e6de0 install VNDK APEX instead of VNDK libs
VNDK APEX replaces VNDK libs under /system/libs/vndk[-sp].

For current VNDK (vndk_package), com.android.vndk.current APEX is
installed instead of VNDK libraries.

For older versions of VNDK (vndk_snapshot_package),
com.android.vndk.v## APEXes are installed along with prebuilt VNDK libs.
The reason why phony targets of VNDK prebuilts are still installed is
that phony targets install the required *.libraries.##.txt files to
/system/etc.

After those .txt files are moved to APEXes, then we can remove those phony
targets.(b/141450808)

Bug: 141451661
Test: m && boot (tested with cuttlefish)

Change-Id: Ibfa06d42ec0081fa7010091ef097bb940bacf8d6
2019-10-13 04:18:05 +09:00
Steven Moreland a84540e557 Merge "mainline_system: libhwbinder/libhidltransport"
am: 2ce54fa76a

Change-Id: Icf8f192120bbd9f8ee186a52f90f336700cd1704
2019-10-11 13:49:24 -07:00
Steven Moreland 2ce54fa76a Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-11 20:19:13 +00:00
Harpreet "Eli" Sangha 4a27b4e3fe Merge "Add Vibrator HAL 1.4"
am: 0ffe0c6248

Change-Id: Icc4968fb4f33b173484c5e3ecc028b65fcb0279f
2019-10-10 17:43:10 -07:00
Josh Gao 5f96f5ce35 Move remount to PRODUCT_PACKAGES_DEBUG.
required seems to conflict with apex with the following error:

    build/make/core/main.mk:1338: warning: build/make/target/product/aosp_x86_64.mk produces files inside build/make/target/product/mainline_system.mks artifact path requirement.

Test: treehugger
Change-Id: Ifb1072b4585a94355909b33e3b8129455c35714a
2019-10-10 13:12:13 -07: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
Lev Proleev 176c4afae7 Merge "Revert "Add NeuralNetworks HAL v1.3""
am: f5f487be03

Change-Id: Iaa860c79d101168b73c8ee867c3259758fbffc6d
2019-10-10 07:20:00 -07:00
Lev Proleev f5f487be03 Merge "Revert "Add NeuralNetworks HAL v1.3"" 2019-10-10 14:06:42 +00:00
Lev Proleev f1cec4b4a4 Revert "Add NeuralNetworks HAL v1.3"
This reverts commit bace8c091c.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: Idf87926dd40b56b9d6acc2e207be785463f6830a
2019-10-10 13:54:21 +00:00
Lev Proleev 5195c4cf99 Merge "Add NeuralNetworks HAL v1.3"
am: 4b49e75a40

Change-Id: I62a994d9f8eec83e42623836b9eed269b889f2a3
2019-10-10 05:07:25 -07:00
Lev Proleev 4b49e75a40 Merge "Add NeuralNetworks HAL v1.3" 2019-10-10 10:25:21 +00:00
Yo Chiang b808592783 VNDK library list uses installed name
For example, module libprotobuf-cpp-lite has installed library name
libprotobuf-cpp-lite-3.9.1.so.
VNDK library list should use this installed name instead of module name.

Bug: 141019581
Test: m $ANDROID_PRODUCT_OUT/obj/PACKAGING/vndk_intermediates/libs.txt
Change-Id: I7f19fedafdd2809e0b8738bbab6ad513ddb30ea0
2019-10-09 18:12:49 +08:00
Harpreet "Eli" Sangha a0e253ef0e Add Vibrator HAL 1.4
Test: Build
Change-Id: I8de47f2914cd89a0521c520504ff0dc8000205df
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-09 13:49:17 +09:00
David Anderson 0c61e14227 Merge "Add IBootControl HAL 1.1."
am: a8b633d181

Change-Id: Ia78800744ef04a877b062631cc3444f29d9a35bd
2019-10-08 12:28:49 -07:00
David Anderson a8b633d181 Merge "Add IBootControl HAL 1.1." 2019-10-08 19:03:05 +00:00
Lev Proleev bace8c091c Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: Id1baae2c00a38e5327ab144db76189f53bcb04cf
Merged-In: Id1baae2c00a38e5327ab144db76189f53bcb04cf
(cherry picked from commit fde53f4e3e)
2019-10-08 16:57:59 +01:00
David Anderson b9e8d8cac8 Add IBootControl HAL 1.1.
Bug: 138861550
Test: m check-vndk-list
Test: m
Change-Id: If09d031e5acf1178fce942526782a41426c5180b
Merged-In: If09d031e5acf1178fce942526782a41426c5180b
2019-10-07 17:13:11 -07:00
Yifan Hong 5154d3f4d7 VNDK-core += health@2.1
Test: builds
Bug: 137670450

Change-Id: Idbbe5c8a4d5060061514d428de0a38a233ffd8b8
2019-10-07 16:54:04 -07:00
Nikita Ioffe e542a799c8 Merge "Unconditionally install shim apex on system partition"
am: 42b2b54c2b

Change-Id: I303417bee4f5143abfda29eadfb997203c0cb168
2019-10-07 08:36:15 -07:00
Nikita Ioffe 42b2b54c2b Merge "Unconditionally install shim apex on system partition" 2019-10-07 15:10:10 +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 c4ca72d8e9 Merge "Clean up mainline whitelist in aosp_product.mk"
am: 8ca4bf76d6

Change-Id: I7bcd80d30c3edea5ebfae340bf2869e7b798f445
2019-10-07 03:36:45 -07:00
Roland Levillain 0a24633ef5 Merge "Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`."
am: 81681abfef

Change-Id: I1dea79a8ff7ee4f1e12cd731e87b124dca324ecc
2019-10-07 03:35:27 -07:00
Yo Chiang 2214b0fb08 Merge "Add x86 / x86_arm mainline_system product"
am: 16652990ec

Change-Id: Ibb05a35c9da7176d08ddee433d0f26cfd1952f8b
2019-10-07 03:34:44 -07:00
SzuWei Lin b1ed0bd95b Merge "Remove healthd from base_product.mk"
am: 7c7f144484

Change-Id: Ic1afd4de3df00df5d6779a1dbeb90fef40f8cf19
2019-10-07 03:29:20 -07:00
Yo Chiang 8ca4bf76d6 Merge "Clean up mainline whitelist in aosp_product.mk" 2019-10-07 10:28:46 +00:00
Roland Levillain 81681abfef Merge "Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`." 2019-10-07 10:27:41 +00:00
Treehugger Robot 16652990ec Merge "Add x86 / x86_arm mainline_system product" 2019-10-07 10:27:14 +00:00
Treehugger Robot 7c7f144484 Merge "Remove healthd from base_product.mk" 2019-10-07 10:10:34 +00:00
Yo Chiang e9b513a35a Clean up mainline whitelist in aosp_product.mk
Bug: 138281437
Bug: 140912362
Test: for prod in aosp_bonito aosp_arm64 aosp_cf_x86_phone ; do \
        lunch ${prod}-userdebug \
        m -j100 nothing || exit 1 \
      done

Change-Id: I2bc1f49ce68e49313e5c00104aad7b21a101ca7a
2019-10-05 09:06:36 +00:00
SzuWei Lin 24e6bcd0b6 Remove healthd from base_product.mk
healthd had been deprecated from Android P.
Does not need to support it now.

Bug: 142164625
Bug: 138284857
Test: lunch gsi_arm64-userdebug;make -j
Test: No healthd in out folder
Change-Id: I48db70f4bf39f6322bd2e80e536e2ec96b3a6408
2019-10-05 14:05:48 +08:00
Yo Chiang db7529d009 Merge "Re-submit "Make mainline device use apex""
am: 491966fb7f

Change-Id: I32e950b118863ddfcfcb621cff664eb860345dc1
2019-10-04 20:44:15 -07:00
Yo Chiang 8b674819ac Add x86 / x86_arm mainline_system product
- Add mainline_x86 / mainline_x86_arm board
- Add mainline_system_x86 / mainline_system_x86_arm product
- BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4

These products build only system.img and vbmeta.img.
These serve as a "golden example" for x86 / arm64 CSI.

Bug: 141972143
Bug: 141657175
Test: lunch mainline_system_x86-userdebug; m
Test: Compare $ANDROID_PRODUCT_OUT against sdk_phone_x86 / aosp_cf_x86_phone
Change-Id: I40dec69ceadfe7057c1706b883b81958d3c0a416
2019-10-05 11:35:33 +08:00
Yo Chiang 491966fb7f Merge "Re-submit "Make mainline device use apex"" 2019-10-05 03:32:45 +00:00
Bill Peckham 2c4d3a7b6c Merge "Moving recovery resources from /system to /vendor"
am: 959b5ebbf8

Change-Id: Ied05e3765ea8afbc29b4d9bf713217d0d3753fa5
2019-10-04 20:24:19 -07:00
Bill Peckham 959b5ebbf8 Merge "Moving recovery resources from /system to /vendor" 2019-10-05 03:14:12 +00:00
Roland Levillain b3a503df7f Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`.
When `OVERRIDE_TARGET_FLATTEN_APEX` is defined (e.g. set in the
environment), `TARGET_FLATTEN_APEX` is forcibly assigned its value.

This is useful to enable/disable APEX flattening from the command
line (thus ignoring the product's default configuration), for testing
purposes.

Note: Previously it was possible to set `TARGET_FLATTEN_APEX` directly
and have the same effect, but recent changes in the build
configuration now prevent that option.

Test: Check that:
        export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && . ./build/envsetup.sh \
          && lunch aosp_walleye-userdebug \
          && export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && build/soong/soong_ui.bash --dumpvar-mode TARGET_FLATTEN_APEX
      returns:
        true
Bug: 121117762

Change-Id: Ib9ccae38430340de38e4758b4f55df2c65ea60d5
2019-10-04 18:35:49 +01:00
Anton Hansson b8205595c0 Re-submit "Make mainline device use apex"
The build system default was changed to not support apex, but
we want the mainline device to enable it.

Test: make mainline_system
Merged-In: I9f29e8354acffb1856dfd8a173b80a3f9324630c
Change-Id: I9f29e8354acffb1856dfd8a173b80a3f9324630c
2019-10-04 20:25:14 +08:00
Yo Chiang fc810895ec Merge "Enforce /system module RRO for mainline products"
am: c578262e37

Change-Id: I4db1c617728cdc653ba993ddc414b6acca88db1d
2019-10-03 23:20:01 -07:00
Treehugger Robot c578262e37 Merge "Enforce /system module RRO for mainline products" 2019-10-04 05:58:44 +00:00
Bill Peckham e868aec14b Moving recovery resources from /system to /vendor
This change is part of a topic that moves the recovery resources from the
system partition to the vendor partition, if it exists, or the vendor directory
on the system partition otherwise. The recovery resources are moving from the
system image to the vendor partition so that a single system image may be used
with either an A/B or a non-A/B vendor image. The topic removes a delta in the
system image that prevented such reuse in the past.

The recovery resources that are moving are involved with updating the recovery
partition after an update. In a non-A/B configuration, the system boots from
the recovery partition, updates the other partitions (system, vendor, etc.)
Then, the next time the system boots normally, a script updates the recovery
partition (if necessary). This script, the executables it invokes, and the data
files that it uses were previously on the system partition. The resources that
are moving include the following.

* install-recovery.sh
* applypatch
* recovery-resource.dat (if present)
* recovery-from-boot.p (if present)

This change includes the platform build system and release tools changes to
move the recovery resources from system to vendor (or /system/vendor). The
release tools need to know where to generate the recovery patch, and they
discover this from misc_info.txt variable board_uses_vendorimage, which the
platform build system generates.

We remove applypatch from PRODUCT_PACKAGES, but it is added back as a required
module in target/product/base_vendor.mk.

Several release tools rely on the misc_info.txt board_uses_vendorimage variable
to know how to generate and detect the recovery patch.

This change partially removes the --rebuild_recovery flag from the
merge_target_files.py script. The flag will be fully removed in a follow-on
change.

Bug: 68319577
Test: Ensure that recovery partition is updated correctly.
Change-Id: Ia4045bd67ffb3d899efa8d20dab4c4299b87ee5f
2019-10-04 00:04:34 +00:00
Steven Moreland 05cbd78993 Merge "Remove libhidltransport/libhwbinder from VNDK."
am: 147f46ba72

Change-Id: I49c531f53e1a18a6dc1e36c3b3abdd6a8e4ebe86
2019-10-02 14:25:00 -07:00
Steven Moreland 147f46ba72 Merge "Remove libhidltransport/libhwbinder from VNDK." 2019-10-02 21:10:50 +00:00
Dongwon Kang ed15824ac4 Merge "Remove codec libs from base_system.mk"
am: 03d3a36664

Change-Id: Icd39b6851fe01d9bb84f22b2bca1d2cc7976b754
2019-10-02 13:24:48 -07:00
Treehugger Robot 03d3a36664 Merge "Remove codec libs from base_system.mk" 2019-10-02 18:21:41 +00: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
Pete Bentley 0867677242 Merge "Install BoringSSL self test binaries to vendor image."
am: 4c71349fe6

Change-Id: I0df28b485b88e7ca280dd5c14f51a988726ccc2d
2019-10-01 15:56:42 -07:00
Treehugger Robot 4c71349fe6 Merge "Install BoringSSL self test binaries to vendor image." 2019-10-01 22:38:19 +00:00
Dongwon Kang 6e2b1f84fd Remove codec libs from base_system.mk
- libstagefright_enc_common
- libstagefright_amrnb_common

Bug: 141885505
Test: build and boot.
      Checked libstagefright_enc_common.so doesn't exist in /system/lib64.
      libstagefright_amrnb_common.so is still there because other system
      module, librtp_jni.so, is using it, but there is no reason to keep
      this in base_system.mk.

Change-Id: I43692b50bd23e0b857606b42cb000c8566489dd6
2019-10-01 15:16:11 -07:00
Yo Chiang ee69213ce1 Merge "Enable mainline checking for mainline_system_arm64"
am: efd0d2da0f

Change-Id: I411a4ee5c3d21e66d4bba3197234a2330a226422
2019-10-01 02:45:31 -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
Pete Bentley e28c732521 Install BoringSSL self test binaries to vendor image.
Required in order to run test self test for the vendor copy of
libcrypto.so which may differ from the one in /system and so will use
differently name flag files in order to avoid running the BoringSSL
Known Answer Tests on every process startup, impacting system health.

Bug: 141150335
Test: TH
Change-Id: I1db922379a59fa66fc65b6d92d370f33a2c65799
Merged-In: I1db922379a59fa66fc65b6d92d370f33a2c65799
(cherry picked from commit e3ab8eab25)
2019-09-30 20:38:05 +01:00
Kiyoung Kim 24dc38bed9 Merge "Add library list for VNDK using core variant"
am: 1f9387ae01

Change-Id: Ic97255f7031e5275e2decbbf5fc40d06c86ca3ba
2019-09-29 18:59:08 -07:00
Kiyoung Kim 7b04103fb9 Add library list for VNDK using core variant
Some device requires VNDK_USING_CORE_VARIANT list, but it was not
implemented in previous. Adding this library list to the build target so
it can be added to system image.

Bug: 141695559
Test: m -j passed & Tested from Cuttlefish
Change-Id: Ic6847fd1966d4e1884cdce97015c8c1d1e0f3422
2019-09-27 14:02:31 +09:00
Tri Vo 9c35393a71 Merge "Remove ashmemd and related artifacts"
am: a59a948d62

Change-Id: Ib3928a5b7e687725d5277ba1597e0ea60ffca989
2019-09-26 11:34:59 -07:00
Treehugger Robot a59a948d62 Merge "Remove ashmemd and related artifacts" 2019-09-26 17:56:53 +00:00
Yifan Hong edd50a663f Merge "Add snapshotctl to base system"
am: 066539f1cd

Change-Id: I02667ffe9a07fb2fc974c9fa3203ee7bfa103656
2019-09-25 17:15:09 -07:00
Yifan Hong 066539f1cd Merge "Add snapshotctl to base system" 2019-09-26 00:01:57 +00:00
Steven Moreland a2c1d2b4d0 Remove libhidltransport/libhwbinder from VNDK.
Since they are empty.

Bug: 135686713
Test: builds
Change-Id: Ic7206bfc4fb3ba481ea025eb709054c6b8fc307d
2019-09-25 14:58:06 -07:00
Dongwon Kang e88fe25175 Merge "Remove libvorbisdec, which is not used in /system, from base_system.mk"
am: b9d1c27d59

Change-Id: Ie049bcc21bd8f9541645d6136ed7210493e2023d
2019-09-25 12:00:30 -07:00
Dongwon Kang b9d1c27d59 Merge "Remove libvorbisdec, which is not used in /system, from base_system.mk" 2019-09-25 18:50:11 +00:00
Dongwon Kang dabb8684f6 Remove libvorbisdec, which is not used in /system, from base_system.mk
Test: build and boot. Checked libvorbisdec.so is not in /system/lib[64]
Bug: 141257741
Change-Id: Ic016c5a552fb2e7e59ac237e4112132da86128d3
2019-09-24 18:52:44 -07:00
Bowgo Tsai 1c2efea5a3 Merge "Moving "persist.traced.enable" to /product/build.prop"
am: ca3d0b1872

Change-Id: I5dcb9fcfd47004c0950b98f348c04096711e43c8
2019-09-24 18:45:59 -07:00
Treehugger Robot ca3d0b1872 Merge "Moving "persist.traced.enable" to /product/build.prop" 2019-09-25 01:25:34 +00:00
Tri Vo 55f2896442 Remove ashmemd and related artifacts
Bug: 139855428
Test: n/a
Change-Id: Ia0dcfc47d4792c7265a884b787a788ab80442a8e
2019-09-24 15:03:22 -07:00
Przemyslaw Szczepaniak d373f68700 Merge "Add libneuralnetworks_packageinfo to dependencies."
am: 465946c5a8

Change-Id: Ib9aa9530b321dd09990f7a69ce9adfb34d57d450
2019-09-24 08:24:40 -07:00
Przemyslaw Szczepaniak 465946c5a8 Merge "Add libneuralnetworks_packageinfo to dependencies." 2019-09-24 15:08:09 +00:00
SzuWei Lin e8dad3a9c5 Merge "Phase out Legacy GSI and gsi_common.mk"
am: 9fdb0b9250

Change-Id: I03b603c6003961e36fa38ba53494a54ee75bd740
2019-09-23 21:21:26 -07:00
Treehugger Robot 9fdb0b9250 Merge "Phase out Legacy GSI and gsi_common.mk" 2019-09-24 02:27:20 +00:00
Yifan Hong a27d15a3f1 Add snapshotctl to base system
Test: build and check output
Bug: 135752105
Change-Id: I229fd03994e7145b9e05452c4d564379c53d8a61
Merged-In: I229fd03994e7145b9e05452c4d564379c53d8a61
2019-09-23 14:18:14 -07:00
Evgeny Eltsin 1adb3e1b89 Merge "Add generic_x86_64_arm64 board"
am: 0b58060cae

Change-Id: I7774df8cb41755100ab7712eb4891960fe364e81
2019-09-23 11:59:50 -07:00
Treehugger Robot 0b58060cae Merge "Add generic_x86_64_arm64 board" 2019-09-23 18:43:39 +00:00
SzuWei Lin 73bff9f12a Merge "Remove cache parition on emulator"
am: e6922770e6

Change-Id: I99d08d9b0a6f7a1a9433a03f66df0eb6fda92b1b
2019-09-23 10:19:20 -07:00
Evgeny Eltsin 5c36806fbf Add generic_x86_64_arm64 board
An x86_64 board + third-party arm64 to x86_64 binary translator.

Test: none
Change-Id: I15c6249be8fc7f3e716213c9a3fe6b0fe9563d1c
2019-09-23 16:53:18 +02:00
SzuWei Lin f0776a40d0 Remove cache parition on emulator
Bug: 136616665
Test: Boot aosp_x86_arm to home screen
Test: Boot aosp_x86 to home screen

Change-Id: Id20d96afacd89e73a6c45febad5151becbe85342
2019-09-23 14:37:00 +00:00
Yo Chiang a6da511f08 Merge "Move ro.com.android.dataroaming sysprop to aosp_product.mk"
am: f129ffa044

Change-Id: I9b3a79c0c0fefe2635dd0f093d99fd78eb45072e
2019-09-23 06:14:38 -07:00
Treehugger Robot f129ffa044 Merge "Move ro.com.android.dataroaming sysprop to aosp_product.mk" 2019-09-23 12:51:46 +00:00
Przemyslaw Szczepaniak 507d69df89 Merge "Remove android.hardware.neuralnetworks@1.X dependencies."
am: 164745d245

Change-Id: I5aea99819536a7909a994d1127545ccb8369eed5
2019-09-23 03:02:24 -07:00
Przemyslaw Szczepaniak 164745d245 Merge "Remove android.hardware.neuralnetworks@1.X dependencies." 2019-09-23 09:46:01 +00:00
Mike Ma 45ca999e3d Merge "Removing IVrComposerClient 1.0 from vndk."
am: e8e3b5f0ba

Change-Id: I4d233684e3fdb7d6b1bb1b0313a1ab3c16d264c4
2019-09-20 08:12:31 -07:00
Yo Chiang fd59e543e8 Move ro.com.android.dataroaming sysprop to aosp_product.mk
aosp_${device}.mk all have this system property set inside
vendor/build.prop:
  ro.com.android.dataroaming=true

so move this common setting into aosp_product.mk

We don't move this to //device/google/${device}/device-${device}.mk
because this property is only used by AOSP builds, so it may cause
issues if we make it a common setting across all device builds.

Bug: 136525499
Bug: 135502030
Test: Compare $ANDROID_PRODUCT_OUT before and after this change
Change-Id: Idd9e235707d9a7fea28fa8c741ad1a4014f71c86
2019-09-20 12:04:03 +00: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
mamik 5980f173c4 Removing IVrComposerClient 1.0 from vndk.
Bug: 141255490
Test: Manual, test build on master.
Change-Id: I9b65203e0d067855db03bda4e1b08333c59a0b4d
2019-09-19 18:10:05 +00:00
Przemyslaw Szczepaniak 6cbaf66026 Remove android.hardware.neuralnetworks@1.X dependencies.
After moving NNAPI to an APEX, android.hardware.neuralnetworks@1.X
were added as explicit dependencies to enable NNAPI static tests
to run.

It's possible to make them included in NNAPI static tests as static
libraries, no point in keeping them here.

Bug: 139120468
Test: flashed crosshatch, NNAPI static tests
Change-Id: Ib7fb001cb76c9f36dc651f268c9acb7c7bb43a43
2019-09-19 17:43:06 +01:00
SzuWei Lin 22096814e3 Merge "Revise aosp_x86_arm to inherit from mainline_system directly"
am: 7be2b01f3c

Change-Id: I21626f8bfe8705a4486edf19ff3494dbbbf6db83
2019-09-17 21:53:02 -07:00
Treehugger Robot 7be2b01f3c Merge "Revise aosp_x86_arm to inherit from mainline_system directly" 2019-09-18 04:41:30 +00:00
Harpreet \"Eli\" Sangha 564e016e30 Merge "Add CLI for Directly Invoking IDL APIs"
am: ccbdb22fd4

Change-Id: I3466221032014a2903de7c4a6f241aae886ff5aa
2019-09-17 21:07:03 -07:00
Treehugger Robot ccbdb22fd4 Merge "Add CLI for Directly Invoking IDL APIs" 2019-09-18 03:43:29 +00:00
SzuWei Lin 18ef515e58 Revise aosp_x86_arm to inherit from mainline_system directly
After applying the patch, the contents in system/product align
to the mainline_system/aosp_product.

aosp_x86_arm is not releaseded for GSI. The patch also inherits
from BoardConfigMainlineCommon.mk instead of
BoardConfigGsiCommon.mk. But keeps output system_ext and product
files to /system/system_ext/ and /system/product/.

Bug: 136616665
Test: Compare the product out folder with/without the patch
Change-Id: I2aefbd2d3e71e26219508e53161fa8a3cc2fd652
2019-09-18 02:11:39 +00:00
Colin Cross c43f0bff6d Merge "Remove protobuf vendorcompat from base_vendor.mk"
am: 70ef3c1c9d

Change-Id: Iac8a423aa7b7fc2acecca0a651050d5f7ef67b15
2019-09-17 15:03:47 -07:00
Colin Cross 70ef3c1c9d Merge "Remove protobuf vendorcompat from base_vendor.mk" 2019-09-17 21:49:37 +00:00
Tao Bao 6f756187fa Merge "Also install verity_key to ramdisk for non-system-as-root target."
am: e430f7652a

Change-Id: Ic001692c7cc750bca1e6f226937a874729c52c4a
2019-09-17 11:43:15 -07:00
Tao Bao c99819311c Also install verity_key to ramdisk for non-system-as-root target.
The commit in d14b895665
(https://android-review.googlesource.com/c/platform/build/+/728287)
changed partition layout, to always build the root dir into system.img,
even for devices not using system-as-root (i.e. the ones with separate
boot ramdisk).

With the new layout, there will be two root dirs for non-system-as-root
targets during the boot. If such a device uses Verified Boot 1.0,
/verity_key needs to be available in both roots, to establish the chain
of trust.
 - bootloader uses the baked-in key to verify boot.img; it then loads
   the ramdisk from the verified boot.img
 - First stage init uses /verity_key (in ramdisk) to verify and mount
   system.img at /system, then chroot's to it
 - Second stage init uses /verity_key (in system.img) to verify and
   mount other partitions

This CL adds rules to additionally install verity_key into ramdisk for
such targets.

Bug: 139770257
Test: Set up a target to use non-system-as-root
      (BOARD_BUILD_SYSTEM_ROOT_IMAGE != true). `m dist`.
Test: Check that both ROOT/verity_key and BOOT/RAMDISK/verity_key exist
      in the built target_files.zip.
Test: Run validate_target_files to validate the above target_files.zip.
      $ validate_target_files \
          --verity_key_mincrypt /path/to/verity_key \
          target_files.zip
Test: Run sign_target_files_apks to sign the above target. Re-run
      validate_target_files on the signed target_files.zip.
Test: python -m unittest test_validate_target_files
Change-Id: Ibe7e771c8c376429add85851ac86055564765d3c
2019-09-17 08:53:16 -07:00
Colin Cross 5ae5da1345 Remove protobuf vendorcompat from base_vendor.mk
It has been added to the individual products that have prebuilts that
reference libprotobuf-cpp-full.so or libprotobuf-cpp-lite.so.

Bug: 117607748
Test: treehugger
Change-Id: I49b79bc0a0b154596158b66cfafebab451c90a95
2019-09-13 16:00:43 -07:00
Przemyslaw Szczepaniak 71289eee5b Add libneuralnetworks_packageinfo to dependencies.
libbinder communication from APEX is not allowed, because it doesn't
form a stable way to communicate. After an update, if system libbinder
and APEX libbinder are out of sync, then they may fail to work with each
other.

libbiner usage is moved into libneuralnetworks_packageinfo library,
which is a stable API library.

Test: build & flash crosshatch
Bug: 139282353
Change-Id: I7238025af13e9430c266a1aea69f0d0381110df8
2019-09-13 09:35:56 +00:00
Harpreet \"Eli\" Sangha 9b29b0cfcb Add CLI for Directly Invoking IDL APIs
Test: Build and Flash
Change-Id: I896423f884659b3081021abf243c63c8e17044df
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-09-13 16:41:40 +09:00
Raman Tenneti d9f835bab8 Merge "Delete AOSP/Email app."
am: 588d913afe

Change-Id: I13659349026582f9bdc64e55852e20f0e4994c31
2019-09-12 11:42:47 -07:00
Raman Tenneti 820f20e990 Delete AOSP/Email app.
BUG: 139497239

Test: Manual
$ make -j 40

Change-Id: I2a32694b899bc4f0a0ba36b152c06689427dabf4
2019-09-12 16:31:57 +00:00
Ian Kasprzak 73de478268 Merge "prepare cellbroadcastreceiver to be a mainline module"
am: 68a6e704d6

Change-Id: I518fb7701a8290fc77d21427604dbd10556c19d0
2019-09-12 09:27:23 -07:00
Ian Kasprzak 68a6e704d6 Merge "prepare cellbroadcastreceiver to be a mainline module" 2019-09-12 15:51:30 +00:00
Bowgo Tsai 57f1d98a67 Moving "persist.traced.enable" to /product/build.prop
This property has a stable API so it can be moved to /product
partition. The interface between /product and /system should be
stable, but that between /system and /system_ext need not.

https://android-review.googlesource.com/c/platform/system/libsysprop/+/952375

Bug: 140788609
Test: build and checks /product/build.prop
Change-Id: I3545b22af9aaf4d7f51e88e626e73ac75ded78fc
2019-09-12 17:56:06 +08:00
TreeHugger Robot 8806061821 Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:35 +00:00
Chen Xu 675b92638d prepare cellbroadcastreceiver to be a mainline module
1. prepare two build targets one for updatable module another
for the legacy platform module with diferent config
2. a new cellbroadcastpermissionconfig module to expose
a signature permission.
3. by default, the build include the legacy version.
Later we will switch to the updatable module after more validation
e.g, usre data migration due to uid change
4. for go devies, always include the platform cellbroadcast to
to avoid creating new process

Bug: 135956699
Test: unit test and test app
Change-Id: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
Merged-In: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
2019-09-11 13:13:05 -07:00
Colin Cross 64c50b353e Merge changes from topic "protobuf-3.9.1"
* changes:
  Keep proguard fields for lite runtime
  Install vendorcompat verison of protobuf
  Make javanano a plugin
2019-09-11 18:00:16 +00:00
Bowgo Tsai 06533fef4a Moving GSI-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So GSI-specific things should be moved to /system_ext.

Also renaming various generic*/system.prop to generic*/system_ext.prop.
This is to put the customization into /system_ext/build.prop instead of
/system/build.prop.

Bug: 137711197
Test: boot a GSI on crosshatch, and checks the value of those properties
Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
2019-09-10 21:55:32 +08:00
Bo Hu 5242dc18bf Merge "emulator: convert sdk_phone_x86 and 64 to CSI" 2019-09-10 03:02:12 +00:00
Jooyung Han 2359e05efb Merge "Skip *.libraries.txt when skipping current vndk" 2019-09-10 01:04:35 +00:00
Treehugger Robot b1374c9262 Merge "Moving emulator-specific properties to /system_ext" 2019-09-09 02:33:19 +00:00
Jooyung Han a3c987d7f3 Skip *.libraries.txt when skipping current vndk
When TARGET_SKIP_CURRENT_VNDK=true current vndk libs are not installed.
Related *.libraries.txt files also should not be installed.

Bug: 132140714
Bug: 137511540
Test: TARGET_SKIP_CURRENT_VNDK=true m systemimage # and, look into /system/etc
Change-Id: Ieea7444c359410dd9a14ac0dd369cae38d18b63a
2019-09-09 11:19:19 +09:00
Xin Li abf6afdce6 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ib7d2f7c5a8aef5c6c3e8f74c6c32d5092f32a166
Merged-In: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
2019-09-08 13:11:47 -07:00
bohu a3daf2e27c emulator: convert sdk_phone_x86 and 64 to CSI
BUG: 134444564
Change-Id: I88a7bc9ac0eb7cd06cce1f10e6f55a3e4c2c27ea
2019-09-07 08:25:59 -07:00
bohu 05f73f0b19 Update generic_x86_arm for native bridge support
BUG: 140623928
Change-Id: I5ea205576393f66421b4edea192d1de9f3249c06
2019-09-06 14:37:17 -07:00
Steven Moreland ec57c7b4ea Merge "VNDK -= libhwbinder_noltopgo" 2019-09-06 17:59:21 +00:00
Colin Cross 4c71549763 Install vendorcompat verison of protobuf
Some prebuilt vendor modules contain references to
libprotobuf-cpp-*.so, but the interface is not stable.  Upgrading
protobuf would cause those modules to fail, so the vendor version
of the new protobuf library is renamed to libprotobuf-cpp-*-3.9.1.so.
Manually install old libprotobuf-cpp-*.so files to /vendor
to avoid breaking products that have prebuilts that reference them.

Once the new version of protobuf is in each product can be
inspected for references to libprotobuf-cpp-*.so on /vendor and
these packages can be included only on those devices that need
them.

Bug: 117607748
Test: m checkbuild
Change-Id: I8ac955eb703e3faf22ff930c59b30385f374ad0a
Merged-In: I8ac955eb703e3faf22ff930c59b30385f374ad0a
2019-09-05 14:42:14 -07:00
Steven Moreland 80c808fcaf VNDK -= libhwbinder_noltopgo
This library is being deleted. People who need symbols from this library
should use libhwbinder instead.

Bug: 135558503
Test: build only
Change-Id: I7dd343cf2b95047f9c22b39bbc5cd9fa98c6c0b3
2019-09-05 14:30:43 -07:00
Vic Yang 0408a6e182 Set TARGET_VNDK_USE_CORE_VARIANT for Go devices
Bug: 119423884
Test: Build a Go device, boot, and check ld.config.txt.
Change-Id: Id996b7b77991ee3db184c780f5822f231426f508
2019-09-05 11:09:25 -07:00
Xin Li c271afebaa Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Bowgo Tsai ac3c65b7bb Reland: Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Test: rm -rf out && build/soong/soong_ui.bash --make-mode \
      TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug droid
Change-Id: Iae9f5fb688f49497563864eb882d5f0ae33c744a
2019-09-05 17:11:07 +08:00
Ian Kasprzak cba65a9c92 Revert "Moving GSI-specific files to system_ext"
This reverts commit 8ef0ffe7e8.

Reason for revert: b/140499897 - Breaking multiple builds across branches.
Test: Forrest - go/forrest_run/L78500000361846284

Change-Id: I618e0d051fdcd7a7afcc09408e20c53f38566e94
2019-09-05 01:03:17 +00:00
Bowgo Tsai 478bda0122 Merge "Moving GSI-specific files to system_ext"
am: a6c80c1117

Change-Id: Ibba7d959d3e8a3e2b97c9138d067f9b6d0593d60
2019-09-04 08:22:42 -07:00
Bowgo Tsai f14ec6bfc3 Moving emulator-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So emulator-specific things should be moved to /system_ext.

Bug: 137711197
Test: build and checks those properties are in /system_ext/build.prop
Change-Id: I0f8afdeda77849b06842dd4f6cd04b7aab08ada4
2019-09-04 13:18:45 +00:00
Bowgo Tsai 8ef0ffe7e8 Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Change-Id: Ida7c2d1b0152c7ef77fa9aeb5d0766d17aec59c5
2019-09-04 14:54:53 +08:00
Bo Hu 75e29ad5d4 Merge "goldfish: support system_ext"
am: 9432b4d052

Change-Id: Iad5ff28eab7ac56a038e192c7aa0f5019e3428a2
2019-09-03 10:40:08 -07:00
bohu 11eadcc4ed goldfish: support system_ext
For sdk_phone_* targets only

Change-Id: I4109a923a53311d09bafc2a0f5a70b2af4509cc3
2019-09-03 07:53:27 -07:00
Martin Stjernholm 874894452f Add new ART APEX.
am: 1ebd568850

Change-Id: I6372bef9ffd3e0f50d6c0bd373b8838cffc58b3b
2019-09-02 03:43:33 -07:00
Martin Stjernholm 1ebd568850 Add new ART APEX.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: Iaf2ba03b4136482f7fc60d464d012014d58216bd
Merged-In: Iaf2ba03b4136482f7fc60d464d012014d58216bd
2019-08-30 17:47:30 +01:00
Juju Sung dd173ae513 Merge "Remove extra brackets in vndk_packages collecting phase"
am: 8f4f97da3f

Change-Id: Ic9d43bf388799d22395a5cc3c3f9a78cfaf700d5
2019-08-29 23:09:44 -07:00
Juju Sung 3021218d2a Remove extra brackets in vndk_packages collecting phase
Built target with syntax error near unexpected token `llndk.libraries.txt'
Unpaired brackets makes syntax error in collecting vndk_packages.

Test: build&flashed
Bug: 140097958
Change-Id: I65683a1fc3e7d2f1c8e4eeb471b23620d48c7c41
2019-08-30 09:59:51 +09: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
Xianyuan Jia 7e36d3d0b6 Merge "Add iperf3 to debug packages"
am: d1f4c15fd2

Change-Id: Ibdd41402fcbe9d96c9e38464eb25f06ce7490f2f
2019-08-27 16:48:10 -07:00
Treehugger Robot d1f4c15fd2 Merge "Add iperf3 to debug packages" 2019-08-27 23:17:20 +00:00
Jeongik Cha 45ae6b065f Merge "Turn on BOARD_USES_METADATA_PARTITION in mainline"
am: b2401b58a1

Change-Id: I751894eb7e75c89d8364611d96273e49e64a1861
2019-08-27 04:16:35 -07:00
Treehugger Robot b2401b58a1 Merge "Turn on BOARD_USES_METADATA_PARTITION in mainline" 2019-08-27 11:02:31 +00:00
Mathieu Chartier 066f23b78a Merge "Revamp nopreload configuration"
am: bca3111cfa

Change-Id: I7f37c8fe0d97d2b8af44a0b11340480c156d2ac2
2019-08-26 09:27:02 -07:00
Mathieu Chartier bca3111cfa Merge "Revamp nopreload configuration" 2019-08-26 16:13:10 +00:00
Amy Zhang 2491b3ca91 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729"
am: e7f5833792

Change-Id: I0ffa402138e9097f5b984d3358a318a8c7ee9e84
2019-08-23 21:17:27 -07:00
Mathieu Chartier 7aa4e8614a Revamp nopreload configuration
No longer speed compile, we will rely on JIT and compilation during
boot to ensure performance.

Removed system ROM instrumentations since this will be done
dynamically.

Fixed renamed profilebootclasspath property.

Test: lunch taimen_nopreload-userdebug
Exempt-From-Owner-Approval: cherry-pick
Bug: 139883463

(cherry picked from commit 6f8fda4937)

Merged-In: I97a3a25c3094f84e130e02692b02832795ee6ef1
Change-Id: Id3e9b30a60d00ad3593f1587aa4b04ef7afe1fec
2019-08-23 22:09:02 +00:00
Amy Zhang e7f5833792 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729" 2019-08-23 22:02:59 +00:00
Henry Fang ab23894a4a Tuner Hal 1.0 to build
Add Tuner Hal 1.0 entry to configure file for building
Test: Manual
bug: 135709729

Change-Id: I6c8fa9382c64dc86f719fdfb17726fa694b6abb7
Merged-In: I6c8fa9382c64dc86f719fdfb17726fa694b6abb7
2019-08-23 00:47:54 +00:00
Xianyuan Jia 41862d9ba4 Add iperf3 to debug packages
Bug: 123261826
Test: manual build
Change-Id: Ia7639daccd8ec9e48dbc1e900669c821f73a8be7
2019-08-22 22:54:12 +00:00
Anton Hansson ffdeeae450 Merge "Remove stale artifact whitelist entries" 2019-08-22 12:09:27 +00:00
Anton Hansson 1ce08094d3 Merge "Remove stale artifact whitelist entries" into stage-aosp-master 2019-08-22 10:59:22 +00:00
Tom Cherry e3fa048c10 Merge "Add group_system_ext and passwd_system_ext"
am: e6012c8826

Change-Id: Ib8d0e502fba999796cd24fbc6e065fea328547a2
2019-08-21 13:12:40 -07:00
Tom Cherry e6012c8826 Merge "Add group_system_ext and passwd_system_ext" 2019-08-21 19:19:23 +00:00
Tom Cherry 9f8d4eba01 Add group_system_ext and passwd_system_ext
Add the remaining group and passwd files for partitions that have
reserved AIDs.

Test: mainline checks pass
Change-Id: Iae62c9465e0144b77b1d804c17fe6e724a744da2
2019-08-21 08:16:16 -07:00
Jeongik Cha 9478f66632 Turn on BOARD_USES_METADATA_PARTITION in mainline
All the targets that inherit mainline seem to use metadata_partition,
So turn on BOARD_USES_METADATA_PARTITION

Bug: 137920314
Bug: 139731063
Test: m && check if there is /metadata
Change-Id: I17cfb5faf76a3c3d6ce1be594274ea58ebc1d1ae
2019-08-20 14:26:11 +00: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
Howard Chen bc7316fd0c Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master am: f65d253f07
am: 3043018fd0

Change-Id: I1146024ec2912e8426f14d8710dea67781085860
2019-08-19 18:47:47 -07:00
Anton Hansson 7acb41d787 Remove stale artifact whitelist entries
Test: lunch mainline_arm64; m nothing
Change-Id: Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2
Merged-In: Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2
2019-08-19 16:42:48 +01:00
Howard Chen 05f553aa5d Fix boot failure on Q devices with GSI on master
The master GSI is required to support both P and Q.

Bug: 136695702
Test: Boot a Q device with GSI on master
Change-Id: Ic6da4c4a81d145414ba6cb1bde1ccf3b4a8150f1
2019-08-18 23:16:02 +00:00
Anton Hansson 2fbf135539 Cleanup aosp_product whitelist am: c2a5e48d82
am: 40cc963c04

Change-Id: I1061093317e78d9525ab994668e37bbc85a81cce
2019-08-15 09:56:49 -07:00
Anton Hansson c2a5e48d82 Cleanup aosp_product whitelist
These files are build by mainline_system now.

Bug: 138280590
Test: lunch aosp_arm64; m nothing
Change-Id: Icff82e94c538d4e35ca5e73d04b6f02d6731df4c
2019-08-15 12:33:33 +01:00
Hsin-Yi Chen a44dbe5443 Merge "Add tags to lsdump_paths.txt" am: 7205361315 am: a489b755a0
am: c5a074798f

Change-Id: I8de9939fe9dddc1b4228801accba8ac7aadb5617
2019-08-14 20:03:42 -07:00
Hsin-Yi Chen a489b755a0 Merge "Add tags to lsdump_paths.txt"
am: 7205361315

Change-Id: I4874b39acd4727e6969c8ddb235c773c46ee8972
2019-08-14 19:44:40 -07:00
Hsin-Yi Chen 7205361315 Merge "Add tags to lsdump_paths.txt" 2019-08-15 02:20:30 +00:00
Yifan Hong 9672591cef Merge "Add virtual A/B product." am: f555602f57 am: 461a045c21
am: e974f29999

Change-Id: Ibea1211353bb6fc0a3da14d54040407e015043f1
2019-08-09 15:07:03 -07:00
Yifan Hong 461a045c21 Merge "Add virtual A/B product."
am: f555602f57

Change-Id: I500dc67078d199e98d082df51f2af7192cc3c9bf
2019-08-09 14:47:47 -07:00
Yifan Hong f555602f57 Merge "Add virtual A/B product." 2019-08-09 21:25:36 +00: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
vichang 4d6a44b0f9 Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES" am: aa407a85b7 am: e611c35c95
am: 0fee62b5d9

Change-Id: I3a11ff1fc580fed6735d1d13e3863e7be5aedf30
2019-08-08 04:43:43 -07:00
vichang e611c35c95 Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES"
am: aa407a85b7

Change-Id: I8fb91f10a91bf1e115c94ec0ab6a74f6ac797d73
2019-08-08 04:24:18 -07:00
vichang aa407a85b7 Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES" 2019-08-08 11:06:53 +00:00
Yifan Hong 7d37b40c6e Add virtual A/B product.
- Add PRODUCT_VIRTUAL_AB_OTA(_RETROFIT)
- Set ro.virtual_ab.{enabled,retrofit} respectively.

A device will do the following to enable virtual a/b or retrofit:

$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota_retrofit.mk)

Bug: 135752105
Test: build with device with flag set
Change-Id: I6cb1207aef3ddcc40e215e20589abf995ec81aac
2019-08-07 18:31:33 -07:00
Justin Yun ac3686da61 Merge "Revert "Add product and system_ext partition for emulator"" am: 0c55b6d2cb am: 66a0d43db2
am: b3162c117e

Change-Id: Iaa4eca2de01460aea205c45b91c2c3bbb4ebc55a
2019-08-07 17:24:42 -07:00
Justin Yun 66a0d43db2 Merge "Revert "Add product and system_ext partition for emulator""
am: 0c55b6d2cb

Change-Id: I112c27402c00276f2442daeb233ceee73814fe0e
2019-08-07 16:58:49 -07:00
Justin Yun b5570cf17b Revert "Add product and system_ext partition for emulator"
This reverts commit ef7e3f2623.

The configuration affects GSI to have separate partitions for product
and system_ext which was not intended.

Bug: 138742524
Bug: 138382074
Test: emulator; check boot
Change-Id: Ie621d6b49f22ee2775adf1c1497e812f840f8ba7
2019-08-07 23:44:41 +00: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
Hsin-Yi Chen 5cbf33afe9 Add tags to lsdump_paths.txt
- Update the conversion from LSDUMP_PATHS to lsdump_paths.txt.
  LSDUMP_PATHS is a list of "tag:path". Each element is converted to
  "tag: path\n" in lsdump_paths.txt.

- Update the check for redundant ABI dumps.
  prebuilts/abi-dumps/ndk contains the ABI dumps for NDK.
  prebuilts/abi-dumps/vndk contains those for LLNDK, VNDK-core, VNDK-SP,
  except NDK.

Test: make findlsdumps
Bug: 133176785
Change-Id: I90559e6c68a7f901a318cd8d5125e9a7401ac22c
2019-08-05 11:20:22 +08:00
SzuWei Lin fbcac83f23 Merge "Handle zygote_32_64 in gsi_release.mk" am: c016c281c1 am: f627262e95
am: 0b78e41ced

Change-Id: Ib64e91df214c437c869544f957c5cd17b3da997b
2019-08-02 02:14:57 -07:00
SzuWei Lin f627262e95 Merge "Handle zygote_32_64 in gsi_release.mk"
am: c016c281c1

Change-Id: I111fb71d1af901807f17aa4f5e7d1bf82e84a0f9
2019-08-02 01:53:45 -07:00
Treehugger Robot c016c281c1 Merge "Handle zygote_32_64 in gsi_release.mk" 2019-08-02 08:19:33 +00:00
SzuWei Lin bcd7741e81 Handle zygote_32_64 in gsi_release.mk
64 bits GSI expects supporting both zygote_64_32 and zygote_32_64.

The patch adds including init.zygote32_64.rc in gsi_release.mk
direclty, and also revises all GSI releasing build targets.

Bug: 138625977
Test: build aosp_arm64-userdebug and has init.zygote32_64.rc
Test: build aosp_arm-userdebug and no init.zygote32_64.rc
Change-Id: Ia61db1315321798bae8902b35ddaa5e5f3e7dd3e
2019-08-01 11:57:18 +08:00
Justin Yun ef7e3f2623 Add product and system_ext partition for emulator
Build product and system_ext image and add them to super partition.

Bug: 138382074
Test: boot emulator and check system_ext partition mounted
Change-Id: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
Merged-In: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
2019-07-31 10:45:55 +00:00
Justin Yun eac89fa9cb resolve merge conflicts of 0a81687a25 to qt-r1-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iee31e0df5e5d2b94c9ba7d6815fbbb41497c33c6
2019-07-31 13:34:35 +09:00
Justin Yun ff3d62d31d Add product and system_ext partition for emulator
Build product and system_ext image and add them to super partition.

Bug: 138382074
Test: boot emulator and check system_ext partition mounted
Change-Id: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
Merged-In: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
(cherry picked from commit 28843c3e32)
2019-07-31 00:13:19 +00:00
Eino-Ville Talvala a133a497c2 Remove libcameraservice and libcamera_client from base_system
Libcameraservice is only used by cameraserver, and is explicitly listed
as a dependency.  Libcamera_client is used by multiple places, but each
of them lists it as a depedency as well, so it's not needed here.

Removing the unused 64-bit version of libcameraservice will save ~2 MB
on the system partition.

Bug: 138403869
Test: atest CtsCameraTestCases
Merged-In: I196f869350900e7cc1521bc397c6ecff28decb6f
Change-Id: I196f869350900e7cc1521bc397c6ecff28decb6f
2019-07-30 11:28:23 -07:00
Eino-Ville Talvala 976b1e2df9 Remove libcameraservice and libcamera_client from base_system
Libcameraservice is only used by cameraserver, and is explicitly listed
as a dependency.  Libcamera_client is used by multiple places, but each
of them lists it as a depedency as well, so it's not needed here.

Removing the unused 64-bit version of libcameraservice will save ~2 MB
on the system partition.

Bug: 138403869
Test: atest CtsCameraTestCases
Merged-In: I196f869350900e7cc1521bc397c6ecff28decb6f
Change-Id: I196f869350900e7cc1521bc397c6ecff28decb6f
2019-07-26 12:54:44 -07:00
Victor Chang 46d95f752b Add com.android.i18n APEX module to PRODUCT_PACKAGES
Bug: 137009149
Test: device boots
Change-Id: I9de4e6930456e52dec76dd2a67d6e7ddad393332
2019-07-26 18:37:22 +01:00
Kiyoung Kim ffe25d19b4 Merge "Add libraries txt file to build target"
am: cfbf9d32f6

Change-Id: Ieba83e4a38e500379ee2bc703db22a031b3cd198
2019-07-25 03:43:32 -07:00
Treehugger Robot cfbf9d32f6 Merge "Add libraries txt file to build target" 2019-07-25 10:29:39 +00:00
Przemyslaw Szczepaniak c1a7bec9ce Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX"
am: b4befed86f

Change-Id: I046adc9d59f21c8e3adc7bb426fc0034859b4a7d
2019-07-24 02:25:42 -07:00
Przemyslaw Szczepaniak b4befed86f Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX" 2019-07-24 09:12:18 +00:00