Commit graph

56130 commits

Author SHA1 Message Date
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
Treehugger Robot
4dc0c25643 Merge "Check if installable before installing unstripped" 2019-10-07 23:56:05 +00:00
Tao Bao
b6d4556896 Merge "releasetools: Update the handling of recovery fstab." am: 7b1c49a70d
am: 802fd89263

Change-Id: If4e1b15dee0077a625935ff0f5f309a391be5f1d
2019-10-07 13:08:37 -07:00
Tao Bao
802fd89263 Merge "releasetools: Update the handling of recovery fstab."
am: 7b1c49a70d

Change-Id: I6070ffefaa7360f5f9c7527af95265de4c881bf2
2019-10-07 12:54:57 -07:00
Tao Bao
60f5d67677 releasetools: Update OWNERS.
Test: N/A
Change-Id: Ie476ff08a360f15f769e54dca7428a2d055f1a37
2019-10-07 12:39:55 -07:00
Tao Bao
c3825ae130 Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS." am: e3c95f71e7
am: 34bd354511

Change-Id: Id6380258de35c93ccc1dbdfcfc7c806ad6141fb9
2019-10-07 12:36:12 -07:00
Tao Bao
7b1c49a70d Merge "releasetools: Update the handling of recovery fstab." 2019-10-07 19:33:21 +00:00
Tao Bao
4bdfb36549 Merge "releasetools: Fix releasetools_py3_test." am: ae3a9a138d
am: fa4ea59837

Change-Id: Ic9e91053ccb2347dfb0c218fd268beb380933b39
2019-10-07 12:32:51 -07:00
Tao Bao
34bd354511 Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS."
am: e3c95f71e7

Change-Id: Id19d9ed15cea91022d2693ab8ffa01a989b1ffaa
2019-10-07 12:28:52 -07:00
Tao Bao
fa4ea59837 Merge "releasetools: Fix releasetools_py3_test."
am: ae3a9a138d

Change-Id: I83842f29a86402497858d73d1b44a61f1c98040b
2019-10-07 12:25:42 -07:00
Tao Bao
c32a0ccd3c Merge "releasetools: Update tests to match SparseImage change." am: d253f8a614
am: e3fdc126c4

Change-Id: I6886609ce22674553c889a2f2de5443fd1f9e8fe
2019-10-07 12:13:00 -07:00
Tao Bao
e3c95f71e7 Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS." 2019-10-07 19:06:46 +00:00
Tao Bao
ae3a9a138d Merge "releasetools: Fix releasetools_py3_test." 2019-10-07 19:06:07 +00:00
Tao Bao
e3fdc126c4 Merge "releasetools: Update tests to match SparseImage change."
am: d253f8a614

Change-Id: I90538d2342ed609328320a261c0d03dd4270a3db
2019-10-07 12:06:02 -07:00
Tao Bao
d253f8a614 Merge "releasetools: Update tests to match SparseImage change." 2019-10-07 18:52:04 +00: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
Jooyung Han
66bd7385d2 Check if installable before installing unstripped
When LOCAL_UNINSTALLABLE_MODULE is true, the module is not installed.
But its unstripped output is installed to the path based on
my_module_path which is not set for it is not installable. Moreover,
my_module_path is not reset after use.

As a result, when LOCAL_UNINSTALLABLE_MODULE is true, the path for
unstripped output is unexpected.

The installation is guarded by LOCAL_UNINSTALLABLE_MODULE now,
which was LOCAL_VNDK_DEPEND_ON_CORE_VARIANT.

Test: m
Change-Id: If18cf76118e058a9e0701a8d66f7ff0f534e5881
2019-10-07 22:33:47 +09:00
Anton Hansson
3c5a18fc16 Document SYSTEM_OTHER_ODEX_FILTER matching
...and add a CleanSpec for the moving preopt files.

Bug: 141707536
Test: N/A
Change-Id: I2f5bc4e2c8e6a9fa4c562d55623c13682d3f93ba
2019-10-07 14:29:58 +01: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
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
Tao Bao
615b65d097 releasetools: Fix releasetools_py3_test.
Test: Use a lunch'd target;
      `atest --host releasetools_test releasetools_py3_test`
Change-Id: Ibcced83a7989ef8fc15464728ab1d5fa71ca988e
2019-10-06 23:29:34 -07:00
Tao Bao
a264feffe8 releasetools: Update tests to match SparseImage change.
The previous change in commit 22632cc82c
changed the behavior in loading file map. It now always puts a copy of
the input text in `extra` field. Update the tests accordingly.

Bug: 79951650
Test: Use a lunch'd target; `atest --host releasetools_test`
Change-Id: Iccf06c817c1305bf9946d7759c6f6f6af21fe85e
2019-10-06 22:21:14 -07:00
Tao Bao
90c0eb02ea Merge "releasetools: Support verifying files with non-monotonic ranges." am: 99d855db8f
am: bb20e1554b

Change-Id: I6406f40b539017baaf202917befd716e6528a6a1
2019-10-06 21:18:58 -07:00
Tao Bao
bb20e1554b Merge "releasetools: Support verifying files with non-monotonic ranges."
am: 99d855db8f

Change-Id: I5f88c53f45a476eef1da8645735d188210f36c64
2019-10-06 21:11:59 -07:00
Tao Bao
99d855db8f Merge "releasetools: Support verifying files with non-monotonic ranges." 2019-10-07 01:33:30 +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
Tao Bao
765668fff7 releasetools: Update the handling of recovery fstab.
First, remove the use of info_dict['fstab'] in add_img_to_target_files.
 - info_dict['fstab'] corresponds to recovery fstab
   (`/etc/recovery.fstab`), which may differ from the one used for
   normal boot.
 - When calling build_image.ImagePropFromGlobalDict, we already have the
   desired info from global dict (`META/info_dict.txt`).

Second, common.LoadInfoDict now loads recovery fstab only for non-A/B
devices. Because the info is only meaningful for installing non-A/B OTAs
(under recovery mode).

Fixes: 132458722
Test: TreeHugger
Test: Build non-A/B incremental OTAs.
Change-Id: Id23e7b17264c123319fe00b1663d52bfd9b4a5e2
2019-10-04 22:39:32 -07:00
Yo Chiang
a3be8add34 Merge "Re-submit "Make mainline device use apex"" am: 491966fb7f
am: db7529d009

Change-Id: I0a927fd611c962f6b6f5a3c2e5f9e869829c2df6
2019-10-04 20:51:16 -07: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
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