Commit Graph

18402 Commits

Author SHA1 Message Date
Yifan Hong
bb937a6b69 Merge changes I1459d62f,I4c2b975e
* changes:
  Build image for super partition
  productservices => product_services
2018-07-30 18:23:38 +00:00
Yifan Hong
199a9911b6 Merge changes from topic "lrap_sysprop" am: 9c1264417f
am: 48b23f3a0c

Change-Id: I1c5e038ed87f92c0137a339e41198038ddc18ffa
2018-07-30 10:45:32 -07:00
Yifan Hong
1167815363 Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS." am: 4f85bace12
am: 09e4e23a2f

Change-Id: I7b69b9780b273982a6b17bb23e04f1dd968ad56e
2018-07-30 10:42:45 -07:00
Yifan Hong
48b23f3a0c Merge changes from topic "lrap_sysprop"
am: 9c1264417f

Change-Id: I82335d291a5ae0a7fe82bb6742652b018943c699
2018-07-30 10:41:10 -07:00
Yifan Hong
09e4e23a2f Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS."
am: 4f85bace12

Change-Id: I01718232aa2de09b46785d029bdd70ff59b8d9d6
2018-07-30 10:38:33 -07:00
Yifan Hong
9c1264417f Merge changes from topic "lrap_sysprop"
* changes:
  ro.boot.logical_partitions moved to product image
  Fix collapse-pairs for last empty property
2018-07-30 17:30:50 +00:00
Yifan Hong
4f85bace12 Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS." 2018-07-30 17:29:51 +00:00
Jae Shin
6fe8c185a2 Merge "Remove workaround for libclang_rt.ubsan* vndk libs" am: 6e5b55bf7f
am: 3bd5e7204d

Change-Id: Ic98e8fa22dd4721b27f3586175b4a637510ee230
2018-07-29 21:34:28 -07:00
Jae Shin
3bd5e7204d Merge "Remove workaround for libclang_rt.ubsan* vndk libs"
am: 6e5b55bf7f

Change-Id: I00c11e37267ca6d23a513849b4b5a7fb91c66b13
2018-07-29 21:30:18 -07:00
Treehugger Robot
6e5b55bf7f Merge "Remove workaround for libclang_rt.ubsan* vndk libs" 2018-07-30 04:24:29 +00:00
android-build-team Robot
631c7c6884 Make change and version bump to PQ1A.180730.001
Change-Id: I5c69e56dafb10bf5ff4f6fa70bf1c050bea5b5cd
2018-07-30 03:16:09 +00:00
Yifan Hong
af9e7f04c3 ro.boot.logical_partitions moved to product image
Test: m productimage -j && cat $OUT/product/build.prop
Bug: 111909365
Change-Id: I62abd5602f6b2fe7eead9d636ffb7708df23fd02
2018-07-27 16:24:38 -07:00
Yifan Hong
285083e475 Fix collapse-pairs for last empty property
If the last token in the argument for collapse-pairs is
key=, then the following lines were written:
    key
    =
This patch fixes it so that key= is written instead.

Test: specify ro.boot.logical_partitions= at the end of
ADDITIONAL_PRODUCT_PROPERTIES and `cat $OUT/product/build.prop`
shows:
ro.boot.logical_partitions=

Change-Id: I33a0efb59871f0e36a93c8fae0d75f2735994301
2018-07-27 16:24:38 -07:00
Yifan Hong
37c0c7c82d Build image for super partition
... for bootstrapping / initializing the device.
Image is built to $(PRODUCT_OUT)/super.img when running
`m dist`. For A/B devices, the image contains other
partitions in the _a slot.

Change-Id: I1459d62f02b95f142dfb3b7608f88ec6801dbf37
Fixes: 111758129
Test: m superimage -j
2018-07-27 13:45:43 -07:00
Yifan Hong
0c3eb63eb3 Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS.
When it is true, all kernel requirements are enforced during OTA.
Otherwise:
- Kernel minor revision is not enforced.
- Kernel configs are not enforced.

Bug: 111840577
Test: `m dist` and inspect system_matrix.xml in OTA zip

Change-Id: I965ee5ef59ff48b600ebfab858ecf0909397fe6b
2018-07-27 12:42:11 -07:00
android-build-team Robot
adff359640 Version bump to PQ1A.180727.001
Change-Id: I917e56aed0af0270449bec17471f74abdc569240
2018-07-27 03:15:59 +00:00
Isaac Chen
bc0248f211 Build GSIs (aosp_$arch products) in sparse format
After aosp/719235 is merged, mk_qemu_image.sh now accepts
images in both raw and sparse formats. So We can build GSIs
(system images of aosp_$arch products) in sparse format, which,
historically, is expected by users of GSIs.

Bug: 111775319
Test: The system images below are all in sparse format:
    $ lunch aosp_x86-userdebug; $m -j; emulator
    $ lunch aosp_x86_64-userdebug; $m -j; emulator
    $ lunch aosp_arm-userdebug; $m -j; emulator
    $ lunch aosp_arm64-userdebug; $m -j; emulator

Change-Id: I4cb8df0908c4618376117249b61c853fac947e47
2018-07-27 10:33:57 +08:00
yangbill
aa595dc2bb Merge "ATest: Sync auto_test_config for multilib modules" am: f2bea1b296
am: 7e7f79c138

Change-Id: If750166d1ece0524f1a69306335e37341de0ff33
2018-07-26 19:00:21 -07:00
yangbill
7e7f79c138 Merge "ATest: Sync auto_test_config for multilib modules"
am: f2bea1b296

Change-Id: Ib7c467d7c6ad52beb5dcb911722594e20390260b
2018-07-26 18:55:12 -07:00
Treehugger Robot
f2bea1b296 Merge "ATest: Sync auto_test_config for multilib modules" 2018-07-27 01:49:45 +00:00
Yifan Hong
ebc041af56 productservices => product_services
Make names consistent.
Some things that does not change:
- productservicesimage target and intermediates

Test: build product services image
Bug: 111609632
Change-Id: I4c2b975e194577aad3d51b908b103880625deb5e
2018-07-26 17:19:02 -07:00
Colin Cross
d4ed885137 Merge changes from topic "manifest_fixer_targetSdkVersion" am: 7b21221d2a
am: 1ef3c64906

Change-Id: Ifbe11df244bc2ee00f17e9a7bb9827cba681a7d1
2018-07-26 15:25:04 -07:00
Yifan Hong
01fa11cfe9 Merge "BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk" am: df899f64d0
am: 2843e2e16f

Change-Id: I5d01fbdc0378c4bcd346e828022d67923b247503
2018-07-26 15:23:42 -07:00
Julien Desprez
40f0e6dfa7 Merge "Add a version.txt file to compatibility suite zips" am: aa2abc3324
am: 5ec361fff6

Change-Id: Ic2858e22703cfdb8ff5cea5d1de06993b0df8a0a
2018-07-26 15:22:18 -07:00
Colin Cross
1ef3c64906 Merge changes from topic "manifest_fixer_targetSdkVersion"
am: 7b21221d2a

Change-Id: I23336d8a71e2b42877606989d330aa68efb57d5e
2018-07-26 15:10:59 -07:00
Yifan Hong
2843e2e16f Merge "BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk"
am: df899f64d0

Change-Id: Icdf456afba7d366373311b292b1675c3cce6bf4c
2018-07-26 15:09:53 -07:00
Julien Desprez
5ec361fff6 Merge "Add a version.txt file to compatibility suite zips"
am: aa2abc3324

Change-Id: I6775b48c36b323c2b7f502acb0a2e12fed04f4c9
2018-07-26 15:09:09 -07:00
Colin Cross
7b21221d2a Merge changes from topic "manifest_fixer_targetSdkVersion"
* changes:
  Pass --library to manifest_fixer.py for android libraries
  Fix dependencies for obfuscated instrumentation tests
  Move manifest fixing to a separate rule
2018-07-26 22:02:36 +00:00
Treehugger Robot
df899f64d0 Merge "BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk" 2018-07-26 21:44:05 +00:00
Treehugger Robot
aa2abc3324 Merge "Add a version.txt file to compatibility suite zips" 2018-07-26 21:30:51 +00:00
Julien Desprez
c8841cdc6a Merge "Update default template for suites native tests" am: 8e472bc42e
am: 64d524ec44

Change-Id: I7cba0cbfd71c0c19a560ec93d68927e1bfd220b7
2018-07-26 13:51:54 -07:00
Julien Desprez
64d524ec44 Merge "Update default template for suites native tests"
am: 8e472bc42e

Change-Id: I4de3729d2ee6f86f498d24692cc577529ed5d4c1
2018-07-26 13:47:48 -07:00
Treehugger Robot
8e472bc42e Merge "Update default template for suites native tests" 2018-07-26 20:38:11 +00:00
Julien Desprez
7a10601e7c Add a version.txt file to compatibility suite zips
This will avoid having to tag jar file with a manifest
implementation version.

Test: make cts, check the zip
Bug: 111834256
Change-Id: Id809217cefb36b4779fdf41c02f5809ba22d03a1
2018-07-26 11:47:46 -07:00
Yifan Hong
78ae26132d BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk
... because variable checks should go there.

Test: pass
Change-Id: I484f928d848fd4f3b3936d1c7fd03976ee64feb2
2018-07-26 10:50:45 -07:00
David Srbecky
47d0e4e0bd Merge "Generate unstripped .oat files in the symbols directory." am: d453f6245d
am: 49eae5a99e

Change-Id: I45d083376393f885e5e8858f17bbd40cf56f3331
2018-07-26 05:21:24 -07:00
David Srbecky
49eae5a99e Merge "Generate unstripped .oat files in the symbols directory."
am: d453f6245d

Change-Id: I4406a0b602514cadaa856cb3d682707fd186dc7b
2018-07-26 05:17:17 -07:00
Treehugger Robot
d453f6245d Merge "Generate unstripped .oat files in the symbols directory." 2018-07-26 12:10:53 +00:00
Anton Hansson
f56e247a70 Merge "Don't apply path enforcements for non-full builds." am: 362fff4fcd
am: b682674226

Change-Id: I19c1525a8a9e27c7c3bbd6617a86eb58e5136ad9
2018-07-26 03:14:58 -07:00
Anton Hansson
b682674226 Merge "Don't apply path enforcements for non-full builds."
am: 362fff4fcd

Change-Id: I8578f069aa8b032832ef35dd78b973b517e6b547
2018-07-26 03:10:49 -07:00
Anton Hansson
362fff4fcd Merge "Don't apply path enforcements for non-full builds." 2018-07-26 10:02:44 +00:00
Mathew Inwood
3fe3a80632 Merge "Build rules to derive greylists from annotations." am: 48a7929962
am: 50f59655ba

Change-Id: I0791dd3dd9a9835485c7ede2a0d791cb3cc40789
2018-07-26 02:41:43 -07:00
Hung-ying Tyan
c565f5c2ed Add more ro.vendor.build.*
to facilitate independent updates of vendor/odm images.

Bug: 78600951 (#56,#57)
Bug: 111491184
Test: build aosp_marlin-userdebug and check vendor/build.prop

Change-Id: I798c13822695259375fbc8d5c7fe08d43a540e46
2018-07-26 17:39:47 +08:00
Mathew Inwood
50f59655ba Merge "Build rules to derive greylists from annotations."
am: 48a7929962

Change-Id: I029776a9e31923b87e125ab0054b398d9c935bce
2018-07-26 01:37:29 -07:00
Mathew Inwood
48a7929962 Merge "Build rules to derive greylists from annotations." 2018-07-26 07:37:29 +00:00
Max Bires
b64277de4c Adding VENDOR_SECURITY_PATCH to vendor partition build.prop
This will add ro.vendor.build.security_patch to /vendor/build.prop on
device

Bug: 76428542
Test: ro.vendor.build.security_patch entry shows up under
/vendor/build.prop

Change-Id: I3d3ec2d0e76fc5e62cd283ed4bce3894423cabdd
Merged-In: I4f783e996cb425a49c2b12ae4f364e12c6ca7784
(cherry picked from 56d444b98f)
2018-07-26 14:35:32 +08:00
yangbill
86f441d899 ATest: Sync auto_test_config for multilib modules
auto_test_config will only be set once for the same
$(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)
ATest should also treat the multilib variant modules as testable.

Fix auto_generated config may have chance to be set as 2nd_arch name

BUG: 111397357
BUG: 110820867
BUG: 80298359

Test: . build/envseup.sh
      lunch aosp_x86_64-eng
      make -j out/target/product/generic_x86_64/module-info.json
      (check module-info.json for hello_world_test)
      make -j hello_world_test
      cat out/target/product/generic_x86_64/testcases/hello_world_test/hello_world_test.config

Change-Id: I69895b6373476c0053f2c6e657770d606ccfbcd1
2018-07-26 14:00:55 +08:00
Jae Shin
4b6ba7e0df Remove workaround for libclang_rt.ubsan* vndk libs
libclang_rt.ubsan* VNDK core libraries are no longer built
for all arch flavors. Now, only the TARGET[_2ND]_ARCH-specific
libs are builts. Therefore no need to filter-out and re-add
libclang_rt.ubsan* VNDK core libraries.

Test: m -j vndk
Change-Id: I48080c1cd546cfc9f14313a3c9559d5c1bb2fdbe
2018-07-26 12:14:12 +09:00
Nan Zhang
8d4b4ba885 Change timestamp to -stubs.srcjar
Test: m clean && m -j docs
Bug: b/70351683

Change-Id: Id036e203bbfd81a9a3c089f21d0832495027447a
Merged-In: Id036e203bbfd81a9a3c089f21d0832495027447a
2018-07-25 17:42:24 -07:00
Colin Cross
acebb3266f Pass --library to manifest_fixer.py for android libraries
manifest_fixer.py needs to know the difference between apps
and android libraries in order to change its behavior around
inserting targetSdkVersion.

Bug: 111347801
Test: m checkbuild
Change-Id: Ic21f1b98e3bcbd782612370c46134fc9dd157512
2018-07-25 16:21:41 -07:00