Commit Graph

41867 Commits

Author SHA1 Message Date
Colin Cross 90b890f9f2 Merge "Use AAPT2 by default" 2018-05-22 17:45:20 +00:00
Tri Vo 494830879c Account for multiple BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR dirs
After https://android-review.googlesource.com/688488
BOARD_PLAT_PUBLIC[PRIVATE]_SEPOLICY_DIR can now specify multiple
directories.

Bug: n/a
Test: build sepolicy

Change-Id: Id850327c29bc626d3d721935edcb2b7afd2fd283
2018-05-22 09:24:10 -07:00
Treehugger Robot 62f6c1802e Merge "core: Remove explicit libpac dependency." 2018-05-22 12:24:33 +00:00
Jiyong Park 565ec59f1f org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:37:30 +09:00
Jiyong Park 2317cf5e6e use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317
Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
(cherry picked from commit 6ac30d5270)
2018-05-22 20:34:42 +09:00
Logan Chien 49cb47b2eb Merge "Remove PRODUCT_EXTRA_VNDK_VERSIONS from AOSP" 2018-05-22 07:55:51 +00:00
Logan Chien 0e9b3e9d5a Remove PRODUCT_EXTRA_VNDK_VERSIONS from AOSP
This commit removes PRODUCT_EXTRA_VNDK_VERSIONS from AOSP branches.
prebuilts/vndk/v27 is missing from these branches.

This commit partially reverts
https://android-review.googlesource.com/c/platform/build/+/682124

Bug: 78605339
Test: aosp_arm64_ab-userdebug builds
Change-Id: Ic64f40dab2d7730f6ebcdf124cd069ed3c845e40
Merged-In: Ibae4a393e6e69f26d7a2d493b93e5739f806147b
2018-05-22 13:45:26 +08:00
Logan Chien fcf4d7200a Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" 2018-05-22 04:04:07 +00:00
Colin Cross ba7699fb9a Use AAPT2 by default
Switch to using AAPT2 by default.  Can be disabled globally with
FORCE_AAPT2=false or per-module with LOCAL_USE_AAPT2 := false.

Bug: 79481102
Test: m checkbuild
Change-Id: I35719f708fa3bcc1d54721e62ac9cc8780f7cbbe
2018-05-22 01:21:55 +00:00
Treehugger Robot 6536378b37 Merge "Add documentation around PATH restrictions" 2018-05-18 23:55:03 +00:00
Dan Willemsen 5039ef4d28 Add documentation around PATH restrictions
Test: view markdown through gitiles
Change-Id: If9ef146d8993d0dbfde85660d5c87b05c1c11888
2018-05-18 11:09:01 -07:00
Tao Bao 6d2ca1f19e Merge "releasetools: Skip checking files with non-monotonic ranges." 2018-05-18 04:28:21 +00:00
Tao Bao d32936d657 releasetools: Skip checking files with non-monotonic ranges.
Bug: 79951743
Test: Run validate_target_files.py on target_files.zip that has
      non-monotonic ranges listed in IMAGES/system.map.
Change-Id: I28d3ca6972d361362589cd51e60731af9994a551
2018-05-17 19:45:16 -07:00
Treehugger Robot 7e15b44c23 Merge "Move support library dependency munging earlier" 2018-05-18 00:00:50 +00:00
Treehugger Robot 1b02cfd8ab Merge "Don't recompute location of AndroidManifest.xml" 2018-05-18 00:00:24 +00:00
Colin Cross 7bc6cab12e Move support library dependency munging earlier
The presence of LOCAL_STATIC_ANDROID_LIBRARIES is used early to
decide whether to move resources to overlays, and late to decide
whether to add --auto-add-overlay.  If support_libraries.mk moves
the last LOCAL_STATIC_ANDROID_LIBRARIES value to
LOCAL_STATIC_JAVA_LIBRARIES then the resources will be moved to
overlays but --auto-add-overlay will not be added, causing aapt2
to fail with:
error: resource bool/leanback_outline_clipping_disabled does not override an existing resource.
note: define an <add-resource> tag or use --auto-add-overlay.

Bug: 79481102
Test: m FORCE_AAPT2=true java
Change-Id: Icc67acf23b846bd506a5d397d02ad5775ad0ea1d
2018-05-17 15:09:17 -07:00
Colin Cross 1c3d83b64c Don't recompute location of AndroidManifest.xml
The location of AndroidManifest.xml has already been computed
by android_manifest.mk, don't duplicate the logic.  Fixes an
extra regeneration triggered by $(wildcard $(my_android_manifest))
when LOCAL_FULL_MANIFEST_FILE points to a generated file, which
will not exist on the first run of kati.

Test: m
Change-Id: Ia56693a4dbbc7d78900019b887f766938dc55dab
2018-05-17 15:09:17 -07:00
Colin Cross e3c456423e Merge "Don't always filter out --auto-add-overlay" 2018-05-17 18:52:53 +00:00
Colin Cross 282065ab15 Don't always filter out --auto-add-overlay
There are some cases where --auto-add-overlay is added for legitimite
reasons, for example in RROs.  Only filter it out from modules that
were using --extra-packages for support library modules.

Test: m FORCE_AAPT2=true java
Change-Id: I165fa577f2204ecbc57e71f946db3f346568ad81
2018-05-17 10:16:04 -07:00
Logan Chien 86b52aec24 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
Merged-In: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
(cherry picked from commit d73b94c097)
2018-05-17 14:25:15 +08:00
Mathieu Chartier 625ad4a0c8 Merge "Move back to using COMMON jars for preopt dependencies" 2018-05-16 22:59:23 +00:00
Treehugger Robot 14fe91bddf Merge "Do not use o=ALL_EMAILS parameter." 2018-05-16 22:54:40 +00:00
Colin Cross 4a8b593768 Merge "Pass 0 to llvm-rs-cc for current" 2018-05-16 19:30:45 +00:00
Chih-Hung Hsieh c5c443c756 Do not use o=ALL_EMAILS parameter.
For security reason, this REST API parameter needs account modification
permission to get all email addresses. Now changed to ask only account
number to verify an email address.

Bug: 79863374
Test: test with existing OWNERS
Change-Id: Ic913b7ad96a69c35d1d91e5871f4c5636e73533d
2018-05-16 11:44:50 -07:00
Colin Cross e2f541bb9f Pass 0 to llvm-rs-cc for current
Apparently empty PRIVATE_RS_TARGET_API is not the same as current,
pass 0 explicitly.

Test: forrest ub-renderscript-test
Change-Id: I8b2001b12161f07c404f78f63a80d82dffa1075f
2018-05-16 09:57:10 -07:00
Mathieu Chartier c52de423af Move back to using COMMON jars for preopt dependencies
There are too many problems when using the stripped jars. One of them
being that the OatFileAssistant can't open the dex files since the
dex location stored in hte oat file is the system partition one.

Bug: 67345922
Bug: 70934104
Test: make
Change-Id: I3812471330ec1d2e3a435f42a3e975de750004ff
2018-05-16 09:56:58 -07:00
Treehugger Robot d350b16d50 Merge "Fix incorrect renderscript zip deps" 2018-05-16 07:13:01 +00:00
Treehugger Robot 00794848df Merge "Allow modules to override FORCE_AAPT2=true with LOCAL_USE_AAPT2 := false" 2018-05-16 07:10:04 +00:00
Treehugger Robot 7207e41ddd Merge "When building unbundled apps, link to the prebuilt stubs lib" 2018-05-16 02:39:01 +00:00
Nan Zhang 90f94965ab Merge "Remove tasks/apicheck.mk" 2018-05-16 01:40:53 +00:00
Treehugger Robot 60e9f76bc2 Merge "Support LOCAL_RENDERSCRIPT_TARGET_API := current" 2018-05-16 01:16:32 +00:00
Jiyong Park 45bb10c470 When building unbundled apps, link to the prebuilt stubs lib
There was a bug that when an unbundled app is built without SDK
(LOCAL_SDK_VERSION isn't set), it is linked to the nonexisting stubs
library from java_sdk_library. The built stubs libs are not created for
unbundled builds. For unbundled builds, we need to use the prebuilt
stubs lib.

Bug: 77575606
Test: m -j
Test: make -j dist
ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk

Change-Id: I70cced1c872053e151fea157e3a6d218b1fab9dc
2018-05-16 09:55:47 +09:00
Colin Cross 1465806ff2 Fix incorrect renderscript zip deps
Fix some incorrect dependencies after I12d33e52019aebac6ea33271939228e4690a4173.

Bug: 73885582
Test: m java FORCE_AAPT2=true
Change-Id: Ica2758991603e1605f629d843d19df5e2ef4fae1
2018-05-15 16:04:47 -07:00
Tom Cherry e64694118a Merge "Require a vendor_ prefix for users/groups in /vendor/etc/{passwd,group}" 2018-05-15 22:36:34 +00:00
Colin Cross d443244fbf Allow modules to override FORCE_AAPT2=true with LOCAL_USE_AAPT2 := false
Bug: 79481102
Test: m java FORCE_AAPT2=true
Change-Id: Iece2158dc887a249eb51086b2497b170b5879979
2018-05-15 15:28:22 -07:00
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 078d4995b7 Merge "Don't export UBSan minimal runtime symbols." 2018-05-15 19:44:32 +00:00
Treehugger Robot 3e83e84115 Merge "Use correct case for GPL." 2018-05-15 17:16:19 +00:00
Tao Bao 3d840c6b98 Merge "releasetools: Use "ota-downgrade=yes" for --override_timestamp." 2018-05-15 16:58:11 +00:00
Xin Li 9335117d7e Use correct case for GPL.
Test: build
Change-Id: Id8c671b142231a9c4baeac3a7b9e3cd328b3217e
2018-05-15 08:37:16 -07:00
Narayan Kamath 8b2380213a core: Remove explicit libpac dependency.
Included via PacProcessor's LOCAL_JNI_SHARED_LIBRARIES

Test: m
Change-Id: I970fcd1554954f3f5b05fddd0cab86bc90d86f9e
2018-05-15 11:27:34 +01: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
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
Tom Cherry 2d197a1e19 Require a vendor_ prefix for users/groups in /vendor/etc/{passwd,group}
Bug: 79528966
Test: successful build with vendor_ prefixed users/groups
Test: expected build failure when not using vendor_ prefixed users/groups
Change-Id: If006c70178aa5bdcc9521a06ef8df2500f70bbb9
2018-05-14 13:16:50 -07:00
Mathieu Chartier 4537ebb7a1 Merge "Use $(AAPT) instead of aapt for verifying uses libraries" 2018-05-14 19:52:47 +00:00
Treehugger Robot fa682fb47a Merge "Remove two stale variables." 2018-05-14 17:39:32 +00:00