Commit Graph

16823 Commits

Author SHA1 Message Date
Colin Cross
532ae3bcfb Support LOCAL_RENDERSCRIPT_TARGET_API := current
Renderscript was using LOCAL_RENDERSCRIPT_TARGET_API := 0 to mean
current.  Use current instead, and check for it when comparing
if LOCAL_RENDERSCRIPT_TARGET_API >= 21.

Fixes an issue where LOCAL_RENDERSCRIPT_TARGET_API := 0 was being
treated as < 21, causing the renderscript resources to be passed
to aapt2:
out/target/common/obj/APPS/RSTestBackward_intermediates/flat-res/zip_res.flata.contents/raw/bc32: error: resource file cannot be a directory.

Bug: 79481102
Test: m java FORCE_AAPT2=true
Change-Id: I7726d0463ce1693bc9653b4d869ced181c491036
2018-05-15 15:28:22 -07:00
Treehugger Robot
e51fcf01bd Merge "Disable dtor inlining for clang-tidy" 2018-05-15 22:15:55 +00:00
Nan Zhang
7e4dd1478e Remove tasks/apicheck.mk
1. Remove tasks/apicheck.mk
2. Convert apicheck tool build to Soong.

Bug: b/78034256
Test: m clean && m checkapi

Change-Id: I0ebdd76586ceb7a90e4d9c10714cbd94b38ef869
Merged-In: I0ebdd76586ceb7a90e4d9c10714cbd94b38ef869
2018-05-15 14:16:13 -07:00
Ivan Lozano
6516a40a4e Merge "Don't export UBSan minimal runtime symbols." am: 078d4995b7
am: 910c257a72

Change-Id: I5b45e2d7afd24d7e6fe145d21fadb6840fecc9c1
2018-05-15 13:04:21 -07:00
Ivan Lozano
078d4995b7 Merge "Don't export UBSan minimal runtime symbols." 2018-05-15 19:44:32 +00:00
TreeHugger Robot
df24c51b24 Merge "Remove tasks/apicheck.mk" into pi-dev-plus-aosp 2018-05-15 18:15:08 +00:00
Xin Li
da4bc44a65 Merge "Use correct case for GPL." am: 3e83e84115
am: dcf513c288

Change-Id: Id4e8272d36f0551b251c16a73c787a3575277259
2018-05-15 10:30:45 -07:00
Nan Zhang
02ca404a00 Remove tasks/apicheck.mk
1. Remove tasks/apicheck.mk
2. Convert apicheck tool build to Soong.

Bug: b/78034256
Test: m clean && m checkapi

Change-Id: I0ebdd76586ceb7a90e4d9c10714cbd94b38ef869
2018-05-15 10:13:30 -07:00
Xin Li
9335117d7e Use correct case for GPL.
Test: build
Change-Id: Id8c671b142231a9c4baeac3a7b9e3cd328b3217e
2018-05-15 08:37:16 -07:00
Jiyong Park
6cb36a5d6c Merge "Convert apicheck tool build to Soong." am: 5e2056b906
am: 90525df267

Change-Id: Ia8242a167369f545c24f76911d315cf7e2b30d4c
2018-05-15 00:05:58 -07:00
Jiyong Park
5e2056b906 Merge "Convert apicheck tool build to Soong." 2018-05-15 05:30:41 +00:00
Jiyong Park
1c671fd7dd Convert apicheck tool build to Soong.
Bug: b/78034256
Test: m clean && m checkapi
Change-Id: Iaced7335714138730349bbea8a993705f197ae77
2018-05-15 11:38:44 +09:00
Colin Cross
92e9d334ae Merge "Allow forcing AAPT2 on" am: 2b42ae8076
am: 7795002bcf

Change-Id: Ic2b3c8841f56f7f4315ba261d53fcbc5594535cc
2018-05-14 18:12:03 -07:00
Treehugger Robot
2b42ae8076 Merge "Allow forcing AAPT2 on" 2018-05-15 00:51:27 +00:00
George Burgess IV
432899a25b Disable dtor inlining for clang-tidy
LLVM r328258 turned on a feature called temporary dtor inlining by
default for all of C++ in clang-tidy. This feature appears to be
somewhat over-aggressive when objects are being passed by value. For
example, given:

void foo(std::unique_ptr<int> i);

void bar() {
  auto x = std::make_unique<int>();
  int *i = x.get();
  foo(std::move(x));
  *i = 99;
}

...clang-tidy will complain about `*i = 99;` being a definite
use-after-free. This is incorrect, however: `foo` could stash the
`unique_ptr` it's given in a global, or a class member, or ...

Until upstream fixes this bug, it's probably best to keep this disabled.

Bug: None
Test: Ran the analyzer across Android locally. Nothing broke; number of
complaints dropped significantly.

Change-Id: I742eedf598a72a533285d913d191bfbbf0ce1688
2018-05-14 15:48:38 -07:00
Jasmine Cha
61b2c70815 Add waves to vendor owner whitelist
Bug: 74360112
Test: AOSP build pass
Change-Id: I7dd78f13fec495111d82828229afabe53abba712
2018-05-14 21:50:28 +00:00
Mathieu Chartier
4fab58f0ae Merge "Use $(AAPT) instead of aapt for verifying uses libraries" am: 4537ebb7a1
am: c3bd43bbc8

Change-Id: Iec5545d6adfd927e8f6ae1a9d37faa6e0d981251
2018-05-14 13:08:55 -07:00
Mathieu Chartier
4537ebb7a1 Merge "Use $(AAPT) instead of aapt for verifying uses libraries" 2018-05-14 19:52:47 +00:00
Anton Hansson
b2c2be9eca Merge "Remove two stale variables." am: fa682fb47a
am: fdbce7be8e

Change-Id: Ia685b6c7205f9b6bb7493a4c10970aaafee0fee1
2018-05-14 10:53:58 -07:00
Calin Juravle
b657d5ce62 Merge "Create dist for boot and system jars" into pi-dev
am: 42293db357

Change-Id: I56c5591dd9818bb7fa9338d3e67c7350b1679146
2018-05-14 10:49:31 -07:00
TreeHugger Robot
42293db357 Merge "Create dist for boot and system jars" into pi-dev 2018-05-14 17:37:41 +00:00
Mathieu Chartier
116790dae8 Use $(AAPT) instead of aapt for verifying uses libraries
For SDK builds, $(AAPT) points to a prebuilt and aapt is not
necessarily in the path.

Test: make -j32 <some SDK build> tests
Bug: 70934104
Bug: 67345922
Change-Id: Icfd62a4e3ec284ed59a61714765e5a909a27947d
2018-05-14 10:18:02 -07:00
Anton Hansson
2c37d704b4 Remove two stale variables.
These two variables are unused, and point to non-existing directories,
so delete them.

Test: make
Change-Id: I5f7577c86847146a7eea827ace74cf8022e19f71
2018-05-14 16:23:51 +01:00
Calin Juravle
8955a99f06 Create dist for boot and system jars
We need the jars on boot and system server classpath in order to
symbolize profile information. Having the jars packed in a dist zip will
help a lot with the tools.

Test: m
Bug: 73313191
Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 16:38:03 -07:00
Mathieu Chartier
594d35bb14 Merge "Fix some issues with LOCAL_USES_LIBRARIES" am: da187dd390
am: 0453825e7e

Change-Id: I715102bd27a0265ba25423337c0fd78e42d2d7cb
2018-05-11 16:15:46 -07:00
Mathieu Chartier
da187dd390 Merge "Fix some issues with LOCAL_USES_LIBRARIES" 2018-05-11 22:51:37 +00:00
Ivan Lozano
e508169caf Don't export UBSan minimal runtime symbols.
When linking in the UBSan minimal runtime, don't export the symbols.
This was resulting in an edge case where symbols were sometimes
undefined at runtime on address sanitized builds if static library
dependencies were integer overflow sanitized.

Bug: 78766744
Test: readelf on libraries show either inclusion of the shared library
or no undefined symbols related to the minimal runtime.
Change-Id: I4382cc72baefd7fa96cd83e8349e82f7b083f5aa
2018-05-11 15:31:25 -07:00
Mathieu Chartier
cda2ef1d84 Fix some issues with LOCAL_USES_LIBRARIES
Properly check the value of PRIVATE_ENFORCE_USES_LIBRARIES instead of
only checking that the variable is non-empty.

Change the logic to use product libraries instead of the common ones.
This is required so that dex2oat can find the oat files when stripping
is enabled.

Bug: 70934104
Bug: 67345922
Test: manual

Change-Id: Iee71c2b26f3c0e136a8971ab913725b2b6e100b8
2018-05-11 13:51:02 -07:00
Christopher Ferris
4d432b5455 Add support for cortex-a55/cortex-a75.
Bug: 78133793

Test: Builds for target.
Change-Id: I98d638017f943083d3832ec2211333c48f07caf2
(cherry picked from commit ce7bf678f2)
2018-05-11 11:23:17 -07:00
Christopher Ferris
05e9f6ce2c Merge "Add support for cortex-a55/cortex-a75." am: b510e7b521
am: 88f9778c34

Change-Id: I484f2313a07d33aad911edf7f714746a8cd327e7
2018-05-11 11:13:07 -07:00
Christopher Ferris
b510e7b521 Merge "Add support for cortex-a55/cortex-a75." 2018-05-11 17:56:12 +00:00
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
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
2029903b64 Allow forcing AAPT2 on
Building with FORCE_AAPT2=true will turn on AAPT2 for all modules
unless they set LOCAL_USE_AAPT2 := false.  The build system will
attempt to rewrite common AAPT patterns into AAPT2 patterns,
including removing --extra-packages for support library packages,
removing LOCAL_RESOURCE_DIR point to support library resources,
adding a default empty manifest file if it doesn't exist, and
converting LOCAL_STATIC_JAVA_AAR_LIBRARIES to
LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 79481102
Test: m checkbuild
Change-Id: I8d9d55fe4d5d5c965c64b0407efe74e0afc35c3a
2018-05-11 02:23: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
Christopher Ferris
47b29ea339 Add support for cortex-a55/cortex-a75.
Bug: 78133793
Bug: 78242072

Test: Builds for target.
Change-Id: I98d638017f943083d3832ec2211333c48f07caf2
Merged-In: I98d638017f943083d3832ec2211333c48f07caf2
(cherry picked from commit ce7bf678f2)
2018-05-11 00:43:19 +00: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
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
Logan Chien
d73b94c097 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
2018-05-10 21:17:58 +08: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
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
Treehugger Robot
5c3646c201 Merge "Build System: Fix rpath error if native executable under testcase folder." 2018-05-10 00:40:27 +00: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