Commit Graph

44519 Commits

Author SHA1 Message Date
Colin Cross
a3e54cd24d Merge changes Ie3d4536b,If2504b7d,I411844fb am: fc56b59db4
am: d3a1fa618f

Change-Id: Id5b5b7d398f4ee2c2acbca24f169728ae940cc61
2018-05-10 22:36:19 -07:00
Colin Cross
d3a1fa618f Merge changes Ie3d4536b,If2504b7d,I411844fb
am: fc56b59db4

Change-Id: I001fbf0e5f572a46959f56b8d77fd8abb730148f
2018-05-10 22:31:24 -07:00
Colin Cross
fc56b59db4 Merge changes Ie3d4536b,If2504b7d,I411844fb
* changes:
  Fix a missed rename to my_proguard_sdk_raise
  Allow 0 in math functions
  Add tests for math.mk
2018-05-11 05:22:20 +00:00
Colin Cross
c27df2b71b Fix a missed rename to my_proguard_sdk_raise
Patch Iaf5853361767f0ea3e9ad4ec908aadd72d639c79 missed one rename
of my_support_library_sdk_raise to my_proguard_sdk_raise.

Test: m checkbuild
Change-Id: Ie3d4536bd80654a7eb4f209ef6d6a8de502a6cdc
2018-05-11 02:23:07 +00:00
Colin Cross
8b170358ba Allow 0 in math functions
Allow non-negative integers instead of positive integers in math
functions so that LOCAL_RENDERSCRIPT_TARGET_API := 0 can be compared
against 21.

Test: make -f ${ANDROID_BUILD_TOP}/build/make/core/math.mk RUN_MATH_TESTS=true
Test: $(get_build_var CKATI) -f ${ANDROID_BUILD_TOP}/build/make/core/math.mk RUN_MATH_TESTS=true
Change-Id: If2504b7de81f8dd676af749a04c9f3e580f298b6
2018-05-11 02:22:54 +00:00
Colin Cross
5bc27ea9f2 Add tests for math.mk
Turn commented out tests into assertion tests, and add more for
functions that didn't have tests.

Test: make -f ${ANDROID_BUILD_TOP}/build/make/core/math.mk RUN_MATH_TESTS=true
Test: $(get_build_var CKATI) -f ${ANDROID_BUILD_TOP}//build/make/core/math.mk RUN_MATH_TESTS=true
Change-Id: I411844fbf00268f863260b7ee42d1795f05c0d16
2018-05-11 02:21:39 +00:00
Bowgo Tsai
4f2b09be68 Merge "Enable /cache mount point" into pi-dev
am: 115aae0f93

Change-Id: I0e89f53b8fe5a932de7641646d5b034358e1bdd0
2018-05-10 19:20:54 -07:00
TreeHugger Robot
115aae0f93 Merge "Enable /cache mount point" into pi-dev 2018-05-11 02:08:25 +00:00
Mathieu Chartier
5714cb34cd [automerger skipped] Merge "Add support for preopt with uses-libraries" am: d6259f8d46
am: 554fa029a4  -s ours

Change-Id: Id921a32c171ae80cfe53bfa84b574603d416c010
2018-05-10 14:35:04 -07:00
Mathieu Chartier
554fa029a4 Merge "Add support for preopt with uses-libraries"
am: d6259f8d46

Change-Id: I908cf9d2ec2624598f82fe654c04d0e62b729e6c
2018-05-10 14:29:29 -07:00
Mathieu Chartier
d6259f8d46 Merge "Add support for preopt with uses-libraries" 2018-05-10 21:17:19 +00:00
Colin Cross
c508fc6982 Merge "Fix zipped resources" am: 46ff7618b0
am: 9c64c59428

Change-Id: Ibd0e76e6596740a7e0300b68e5bc89bb51e11a77
2018-05-10 13:16:04 -07:00
Colin Cross
9c64c59428 Merge "Fix zipped resources"
am: 46ff7618b0

Change-Id: Ic8ceb327268e149801895b84865dec8fd7056124
2018-05-10 13:12:30 -07:00
Colin Cross
46ff7618b0 Merge "Fix zipped resources" 2018-05-10 20:04:25 +00:00
Mathieu Chartier
d022b65c98 Add support for preopt with uses-libraries
Required libraries are specified with LOCAL_USES_LIBRARIES
Optional libraries are specified with LOCAL_OPTIONAL_USES_LIBRARIES

The make rule cross references the libraries against what's stored
in the manifest.

Verification is enabled if LOCAL_ENFORCE_USES_LIBRARIES is true. This
defaults to true if either of LOCAL_USES_LIBRARIES or
LOCAL_OPTIONAL_USES_LIBRARIES are specified.

Bug: 70934104
Bug: 67345922
Test: manual

(cherry picked from commit 09f3b97f4b)

Merged-In: Ifca7d1a993620e9d0e42dc497a4a5d7a6c3f4172
Change-Id: I670431f938c31115a7812c1857c31b9f71675632
2018-05-10 11:52:26 -07:00
Mathieu Chartier
00b42e8c6e Merge "Add support for preopt with uses-libraries" into pi-dev
am: 110d18d73c

Change-Id: Ia861e8d9bb2570ccb10c101e81e83eb372ef41f7
2018-05-10 11:47:48 -07:00
Mathieu Chartier
110d18d73c Merge "Add support for preopt with uses-libraries" into pi-dev 2018-05-10 18:37:12 +00:00
Bowgo Tsai
4e9ff91935 Enable /cache mount point
Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
2018-05-10 15:20:49 +08:00
Jackal Guo
f03ebd862b [automerger skipped] Merge "Allow PRODUCT_COPY_FILES to copy raw APKs into system_other" into pi-dev
am: 732ed64fbd  -s ours

Change-Id: I315de77274cdf14603651522c24ada4d551b1670
2018-05-09 20:22:39 -07:00
Dan Willemsen
ab3974163b [automerger skipped] Allow PRODUCT_COPY_FILES to copy raw APKs into system_other
am: 68e1289626  -s ours

Change-Id: I8ea922e439c5dd9d6f506477616ad7c405e383c4
2018-05-09 20:18:26 -07:00
Jackal Guo
732ed64fbd Merge "Allow PRODUCT_COPY_FILES to copy raw APKs into system_other" into pi-dev 2018-05-10 03:14:12 +00:00
Dan Willemsen
4541382d82 Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" am: 63097b276b
am: 0eeb4e2f4b

Change-Id: Idaf94b2bdc340ec0bfa013c3b7d418cf766e6555
2018-05-09 19:46:33 -07:00
Dan Willemsen
0eeb4e2f4b Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG"
am: 63097b276b

Change-Id: I8a159fb084af38ca4adea68a10e37efe2a3df358
2018-05-09 19:41:58 -07:00
Treehugger Robot
63097b276b Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" 2018-05-10 02:30:00 +00:00
Isaac Chen
d332396af8 Merge "Remove redundant entries from treble_common.mk" into pi-dev
am: 0502416b95

Change-Id: I0e12991e632207c063586d30f1ab7fa7063208e8
2018-05-09 19:03:17 -07:00
Isaac Chen
0502416b95 Merge "Remove redundant entries from treble_common.mk" into pi-dev 2018-05-10 01:56:19 +00:00
Colin Cross
6a58478638 [automerger skipped] Merge "Pass PLATFORM_VERSION to Soong" am: 8f5535fd93
am: cd1d24c5e4  -s ours

Change-Id: Id59d6d2db0d17bbabd22bf65a9d4ba3fc02e4af3
2018-05-09 18:04:11 -07:00
Colin Cross
cd1d24c5e4 Merge "Pass PLATFORM_VERSION to Soong"
am: 8f5535fd93

Change-Id: I3228ba124f2e187ecc7095e84fc8566869642865
2018-05-09 18:00:36 -07:00
yangbill
4e90814306 Merge "Build System: Fix rpath error if native executable under testcase folder." am: 5c3646c201
am: 26f5fb8d60

Change-Id: I6a167a932833b60da5ade47511f2d239c591315e
2018-05-09 17:56:28 -07:00
Treehugger Robot
8f5535fd93 Merge "Pass PLATFORM_VERSION to Soong" 2018-05-10 00:54:13 +00:00
yangbill
26f5fb8d60 Merge "Build System: Fix rpath error if native executable under testcase folder."
am: 5c3646c201

Change-Id: Ib08bd29b620c934288b587df8863656752815a4d
2018-05-09 17:52:21 -07:00
Treehugger Robot
5c3646c201 Merge "Build System: Fix rpath error if native executable under testcase folder." 2018-05-10 00:40:27 +00:00
Dan Willemsen
a362bf4e20 Add micro_bench to PRODUCT_PACKAGES_DEBUG
It's been converted to Soong, so can no longer use LOCAL_MODULE_TAGS. It
appears that some of the test runners expect to have it pre-installed.

Test: m; see it installed.
Change-Id: I189c9bbc2f2add90ac4f6841f4bf13852e4d579f
2018-05-09 17:33:12 -07:00
Elliott Hughes
f29014c082 Merge "Revert "Revert "Revert "Set global default to use lld."""" am: 0f8056b254
am: f25dd76703

Change-Id: I8da835d8b13d4e5ec9f93c6b253dbfa997334f12
2018-05-09 17:05:39 -07:00
Elliott Hughes
f25dd76703 Merge "Revert "Revert "Revert "Set global default to use lld.""""
am: 0f8056b254

Change-Id: I06430a4b82ca389752086e17504146ccd6204c30
2018-05-09 17:01:11 -07:00
Colin Cross
164a33f194 Fix zipped resources
Fix mismatch between output directory of zipsync and input
directory of aapt2.

Test: m checkbuild
Change-Id: If012c943af0c04cc3f0dd5c4266126412ae0a759
2018-05-09 23:56:19 +00:00
Mathieu Chartier
09f3b97f4b Add support for preopt with uses-libraries
Required libraries are specified with LOCAL_USES_LIBRARIES
Optional libraries are specified with LOCAL_OPTIONAL_USES_LIBRARIES

The make rule cross references the libraries against what's stored
in the manifest.

Verification is enabled if LOCAL_ENFORCE_USES_LIBRARIES is true. This
defaults to true if either of LOCAL_USES_LIBRARIES or
LOCAL_OPTIONAL_USES_LIBRARIES are specified.

Bug: 70934104
Bug: 67345922
Test: manual

Change-Id: Ifca7d1a993620e9d0e42dc497a4a5d7a6c3f4172
2018-05-09 16:52:10 -07:00
Elliott Hughes
0f8056b254 Merge "Revert "Revert "Revert "Set global default to use lld."""" 2018-05-09 23:46:16 +00:00
Colin Cross
0fdbb4c910 Pass PLATFORM_VERSION to Soong
Soong needs PLATFORM_VERSION to pass as --version-name when building
framework-res.apk.

Bug: 78324052
Test: aapt dump badging $OUT/system/framework/framework-res.apk  | grep -i version
Change-Id: If47839182a1dd7c7a768b1253dd8b575d777ca7e
Merged-In: If47839182a1dd7c7a768b1253dd8b575d777ca7e
(cherry picked from commit 34aba6cf72)
2018-05-09 23:44:18 +00:00
Colin Cross
39599c9ddf Merge "Pass PLATFORM_VERSION to Soong" into pi-dev
am: 96ec5a58ae

Change-Id: I2824263efd0abeed92b8381fe43607b938edd5ce
2018-05-09 14:40:23 -07:00
TreeHugger Robot
96ec5a58ae Merge "Pass PLATFORM_VERSION to Soong" into pi-dev 2018-05-09 21:32:08 +00:00
Elliott Hughes
876a36e8ac Revert "Revert "Revert "Set global default to use lld."""
This reverts commit da8febf39c.

Bug: http://b/73768157
Reason for revert: breaks several bionic/debuggerd/libunwind_stack gtests

Change-Id: I161cf85cf352b80644524fd4bb70ff7c75fbc1d0
2018-05-09 20:33:25 +00:00
Calin Juravle
5b92db48ef Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev
am: d9a863b534

Change-Id: I3c9a85edc4a8512a9285f552e9ebf09bed465585
2018-05-09 12:12:53 -07:00
Colin Cross
34aba6cf72 Pass PLATFORM_VERSION to Soong
Soong needs PLATFORM_VERSION to pass as --version-name when building
framework-res.apk.

Bug: 78324052
Test: aapt dump badging $OUT/system/framework/framework-res.apk  | grep -i version
Change-Id: If47839182a1dd7c7a768b1253dd8b575d777ca7e
2018-05-09 11:10:15 -07:00
Calin Juravle
d9a863b534 Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev 2018-05-09 18:04:24 +00:00
Calin Juravle
7478781f58 Remove unnecessary dalvik.vm.extra-opts from profile_boot_common
The flag is already passed if dalvik.vm.profilebootimage=true.

Test: m
Bug: 73313191
Change-Id: I7bfe91f295548e6aa9d6a783623e6344221136fb
2018-05-09 17:45:22 +00:00
Isaac Chen
64dec58cc2 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev
am: 0d35d1a425

Change-Id: I9d0865299c34dd6997d08bb1a297ca6acda9ef8b
2018-05-09 00:00:47 -07:00
Isaac Chen
0d35d1a425 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev 2018-05-09 06:53:03 +00:00
Dan Willemsen
68e1289626 Allow PRODUCT_COPY_FILES to copy raw APKs into system_other
Files in this partition aren't actually installed, so we don't need to
use the BUILD_PREBUILT logic for APKs.

Bug: 66960479
Test: try PRODUCT_COPY_FILES of an apk into system, errors
Test: try PRODUCT_COPY_FILES of an apk into system_other, accepted
Change-Id: Ie721d2b884c6badfbe0e46f55c265b770bed618b
Merged-In: Ie721d2b884c6badfbe0e46f55c265b770bed618b
(cherry picked from commit 7d957c911a)
2018-05-09 06:38:28 +00:00
Tri Vo
dab6055646 Merge "Expose selinux variables to Soong." am: d744f8cc8e
am: 570ea0cc8a

Change-Id: Id9d04262afcd7f48c1e1ba248a703d7fd2c48bff
2018-05-08 19:15:26 -07:00