Commit graph

4321 commits

Author SHA1 Message Date
Jordan Liu
8c8e302de9 Add CellBroadcastServiceModule to mk
Bug: 135956699
Test: m -j30 (verify that build includes CellBroadcastServiceModule)
Change-Id: Ib2d734ba2ed3608a4255164e6e50dac349eb9a18
2019-10-14 12:22:08 -07:00
Steven Moreland
1d2c1bf212 Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-09 17:25:43 +00:00
Steven Moreland
3dbd647da5 mainline_system: libhwbinder/libhidltransport
Bug: 135686713
Test: artifact whitelist requirement no longer complaining
Change-Id: Ia142f8e67c31f66f86386b65e009d4faee502c11
2019-10-09 12:28:24 +00:00
David Anderson
fe1523d068 Add IBootControl HAL 1.1.
Bug: 138861550
Test: m check-vndk-list
Test: m
Change-Id: If09d031e5acf1178fce942526782a41426c5180b
2019-10-07 13:53:57 -07:00
Nikita Ioffe
1c8a111a0b Merge "Unconditionally install shim apex on system partition" am: 42b2b54c2b am: e542a799c8 am: 1faa3ffe94
am: 50196498d6

Change-Id: If3663f1d5e0523eff3255c8a3a06fb21ea454b5a
2019-10-07 09:14:51 -07:00
Nikita Ioffe
1faa3ffe94 Merge "Unconditionally install shim apex on system partition" am: 42b2b54c2b
am: e542a799c8

Change-Id: I112f4eb54236c7bb636b1ea5243c892deb0b7243
2019-10-07 08:42:10 -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
Anton Hansson
2c5def62dc Disable vendor path check for mainline variants
This matches what is done for mainline_system_arm64
(in this particular branch).

Test: lunch mainline_system_x86 && m nothing
Change-Id: I4eb236d086bd36b4821ed11411fa404f2d45f2b9
Merged-In: I607781ce7c6299cbc98c54c683d04db3b65c2e21
2019-10-07 13:51:33 +01: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
aa7a61d0c9 Merge "Clean up mainline whitelist in aosp_product.mk" am: 8ca4bf76d6 am: c4ca72d8e9 am: de7d8b19b6
am: 42127e0213

Change-Id: I7a676239700cc1cbd5a496392328523bc98add36
2019-10-07 03:54:46 -07:00
Roland Levillain
fe4671d8f9 Merge "Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX." am: 81681abfef am: 0a24633ef5 am: 6a3e54b47f
am: 824989bee6

Change-Id: Iaeb8684bf93e3d277239958d3b8086f0e855d0f5
2019-10-07 03:53:30 -07:00
Yo Chiang
20c4575af7 Merge "Add x86 / x86_arm mainline_system product" am: 16652990ec am: 2214b0fb08 am: afcd8eb64c
am: 570ea5a8e6

Change-Id: I945b785853fe741759789f8dc2afdf07bc419510
2019-10-07 03:53:01 -07:00
SzuWei Lin
80360791a9 Merge "Remove healthd from base_product.mk" am: 7c7f144484 am: b1ed0bd95b am: 38c1f4b562
am: ed2abde896

Change-Id: I0a23eba7192d99da690e35f4bedc9f8f50f11790
2019-10-07 03:47:11 -07:00
Yo Chiang
de7d8b19b6 Merge "Clean up mainline whitelist in aosp_product.mk" am: 8ca4bf76d6
am: c4ca72d8e9

Change-Id: Ib92468e3bf638d31ff7dd2fa02ef32237bc52e6c
2019-10-07 03:43:08 -07:00
Roland Levillain
6a3e54b47f Merge "Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX." am: 81681abfef
am: 0a24633ef5

Change-Id: Id67efdb4a883e38caf90cf34c0fb8f91fba19aca
2019-10-07 03:41:22 -07:00
Yo Chiang
afcd8eb64c Merge "Add x86 / x86_arm mainline_system product" am: 16652990ec
am: 2214b0fb08

Change-Id: I0e72f39fe0885a9086ecedd7c61bf58e8117f941
2019-10-07 03:40:54 -07: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
SzuWei Lin
38c1f4b562 Merge "Remove healthd from base_product.mk" am: 7c7f144484
am: b1ed0bd95b

Change-Id: I4362588bacac4cf27560a8c5154c2eec33249803
2019-10-07 03:35:00 -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
Bill Peckham
eb40fdcf7e Merge "Moving recovery resources from /system to /vendor" am: 959b5ebbf8 am: 2c4d3a7b6c am: 2ca399a4ec
am: e1212b2740

Change-Id: I66319dad513db3804e7c9ddbe29206c614375896
2019-10-04 20:45:16 -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
Bill Peckham
2ca399a4ec Merge "Moving recovery resources from /system to /vendor" am: 959b5ebbf8
am: 2c4d3a7b6c

Change-Id: Ibcb1f7ca8e41c1f524d26455a7e926eedd919edf
2019-10-04 20:31:01 -07: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
Lev Proleev
603de740c3 Merge "Add NeuralNetworks HAL v1.3" 2019-10-04 15:34:10 +00:00
Yo Chiang
8f5f6721cf Merge "Enforce /system module RRO for mainline products" am: c578262e37 am: fc810895ec am: 86dc21bddf
am: 2a50a7fc23

Change-Id: I216a2c4d897639ffe5cb9e6ba633ae78d8a5666b
2019-10-03 23:38:34 -07:00
Yo Chiang
86dc21bddf Merge "Enforce /system module RRO for mainline products" am: c578262e37
am: fc810895ec

Change-Id: I4930a3e1662107fbac048d8095960d8b87971631
2019-10-03 23:25:31 -07: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
Andrew Lewis
41367e31fc Merge "Revert "[MultiDisplay] remove emulator_system.mk"" 2019-10-03 16:37:14 +00:00
Roshan Pius
3216f38c9c Merge "wifi_stack: Move to network_stack process" 2019-10-03 12:50:26 +00:00
Andrew Lewis
ffebeff06e Revert "[MultiDisplay] remove emulator_system.mk"
This reverts commit 572ce182ef.

Reason for revert: breaks build_test on git_master

Change-Id: I4ba0825ee84f4535ec5efd7a7d1ebe3c80d7b17a
2019-10-03 10:48:45 +00:00
Harpreet "Eli" Sangha
57b3aa9cce Merge "Add Vibrator HAL 1.4" 2019-10-03 05:18:18 +00:00
TreeHugger Robot
62927e47ae Merge "Revert "Disable camera pinning and enable iorapd prefetching by default."" 2019-10-02 22:18:05 +00:00
Dongwon Kang
23cca16a66 Merge "Remove codec libs from base_system.mk" am: 03d3a36664 am: ed15824ac4 am: cd2a1d4a31
am: 13ee9ec3b9

Change-Id: I30b03e308ef709fa89fffd2be2d9e5020720acca
2019-10-02 14:57:23 -07:00
Huan Song
240d467390 Merge "[MultiDisplay] remove emulator_system.mk" 2019-10-02 21:33:25 +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
cd2a1d4a31 Merge "Remove codec libs from base_system.mk" am: 03d3a36664
am: ed15824ac4

Change-Id: I03cf558cdbf9556ae8773a3893bec0ab94b38838
2019-10-02 13:52:15 -07:00