Commit Graph

9484 Commits

Author SHA1 Message Date
Jiyong Park
d3447f29f2 Add use_vendor to APEX module
am: da6eb592bf

Change-Id: I7e5f7a24d6058e7a0fef0f9907e5f0da9e3e2a56
2018-12-20 22:45:38 -08:00
Jiyong Park
da6eb592bf Add use_vendor to APEX module
use_vendor, when set to true, brings vendor variant of the native
libraries and binaries to the APEX.

Bug: 115707625
Test: m (apex_test updated)
Change-Id: Ib4e996f8652f4ce4645a9c22f6914e2ab35edda6
2018-12-20 14:33:02 +09:00
Jiyong Park
670005b635 Fix a nill pointer dereference when TARGET_FLATTEN_APEX
am: 5a8320201a

Change-Id: I84d3a91aa32c6780f1897f34892cae89954cfa05
2018-12-19 21:24:45 -08:00
Jiyong Park
5a8320201a Fix a nill pointer dereference when TARGET_FLATTEN_APEX
When TARGET_FLATTEN_APEX is set to true, there is no single output file
for an APEX that other modules can reference via ":module" syntax.
Return nothing in that case.

Bug: 121221006
Test: TARGET_FLATTEN_APEX=true m
Change-Id: I556b55073720b16fd30fd133af58aac229e958c0
2018-12-20 09:54:35 +09:00
Colin Cross
c6ebed6071 Merge "Add a flag to allow unbundled builds to build SDKs from source"
am: a044a686c5

Change-Id: Ide2970a94a67aad2c55bd07bb1748cc308057d27
2018-12-19 16:47:20 -08:00
Colin Cross
a044a686c5 Merge "Add a flag to allow unbundled builds to build SDKs from source" 2018-12-20 00:35:59 +00:00
Colin Cross
6387ac1074 Merge "Create dexpreopt install dir"
am: 894139e655

Change-Id: I40cf7002fc155f7d7c3c8ffb6b4db0aab85290fa
2018-12-19 16:32:51 -08:00
Treehugger Robot
894139e655 Merge "Create dexpreopt install dir" 2018-12-20 00:14:36 +00:00
Jaewoong Jung
84dcdb8ea4 Add myself as an owner.
am: 80b0f0abb7

Change-Id: Ia093b06aed6a221f8edd8d3b3768ec95181589de
2018-12-19 12:12:34 -08:00
Colin Cross
ed91ae94e2 Create dexpreopt install dir
If dexpreopt is disabled inside dexpreopt_gen there won't be any installed files and the install directory won't be created, causing soong_zip to fail.  Create the directory ahead of time.

Test: treehugger
Change-Id: Icf17d0bcd617eeeafdcd50ab56359fa8d6612822
2018-12-19 18:55:26 +00:00
Jaewoong Jung
23dbe700a4 Merge "Ignore shared libs for static executables."
am: 3a0989ce4c

Change-Id: I338b355c60ec18558d5002c0c70ae85f7b89713e
2018-12-19 08:26:56 -08:00
Jaewoong Jung
80b0f0abb7 Add myself as an owner.
Test: N/A
Change-Id: Ib4303d80793df433d61511710590c0d679908290
2018-12-19 08:19:50 -08:00
Jaewoong Jung
3a0989ce4c Merge "Ignore shared libs for static executables." 2018-12-19 16:16:24 +00:00
Jiyong Park
9b893cfe18 Fix: Flattend APEX is breaking build
am: a88948419a

Change-Id: I2dc5714cf545ff0dadf4dcdc8e56bd6feaac0958
2018-12-19 07:56:58 -08:00
Jiyong Park
a88948419a Fix: Flattend APEX is breaking build
When TARGET_FLATTEN_APEX=true, individual files in an APEX are exported
to make. However, because they lack LOCAL_SOONG_CLASSES_JAR,
soong_java_prebuilt.mk get confused and the build breaks.

Fixing the bug by correctly emitting LOCAL_SOONG_CLASSES_JAR and
LOCAL_SOONG_HEADER_JAR.

Test: TARGET_FLATTEN_APEX=true m
out/target/common/obj/JAVA_LIBRARIES/com.android.conscrypt.conscrypt_intermediates/classes.jar

Change-Id: I65ce86ec825f978a43715146bbd5c1d5af513de0
2018-12-19 23:07:23 +09:00
Sundong Ahn
32f04e838b Merge "Add dependency for sysprop"
am: 6ebbf3da29

Change-Id: Icd09bef563aa335a36327c6e0e252667ac3f5371
2018-12-19 03:29:43 -08:00
Treehugger Robot
6ebbf3da29 Merge "Add dependency for sysprop" 2018-12-19 11:17:10 +00:00
Nicolas Geoffray
4a29a87dc2 Merge "Fix build time preopt with shared library uses."
am: 5be3d6b3f5

Change-Id: I9af21f52f2ca1cafae70b814b519efa42fb5abfe
2018-12-19 00:51:59 -08:00
Nicolas Geoffray
1ddc923d74 Merge "Add an owners file for dexpreopt files."
am: f6efad5b6d

Change-Id: I9aa2f3ccfc32c269dc66f6c2ce7ff99bc5bbad7d
2018-12-19 00:42:39 -08:00
Nicolas Geoffray
5be3d6b3f5 Merge "Fix build time preopt with shared library uses." 2018-12-19 08:37:01 +00:00
Nicolas Geoffray
f6efad5b6d Merge "Add an owners file for dexpreopt files." 2018-12-19 08:34:14 +00:00
Jiyong Park
e3c89e73b7 Merge changes Idb2b552b,I190bca35
am: 8cc51b5620

Change-Id: I045c83d128ed0efbd477cd3a43e80c9bbbc46a09
2018-12-19 00:22:36 -08:00
Evgenii Stepanov
8801703a91 Merge "[hwasan] Reduce history size to save memory."
am: 3181721a1e

Change-Id: Iae83ccfc53a363d45ad4793c3f9d17c697f52a74
2018-12-19 00:19:40 -08:00
Sundong Ahn
5b73f31c80 Add dependency for sysprop
The dependency is added because the module that uses the sysprop library
needs generated code before it is built.

Test: m -j
Change-Id: I2858fc6fa6f2fe16afa2f4a7ae62746ba0f67e5c
2018-12-19 07:23:08 +00:00
Colin Cross
1f367bfe8b Add a flag to allow unbundled builds to build SDKs from source
Mainline modules are tightly coupled to the platform, and should
build against the current SDK from source and not prebuilts. Add
a flag UNBUNDLED_BUILD_SDKS_FROM_SOURCE to specify that a
TARGET_BUILD_APPS build should build the current SDK instead of
using the prebuilts.

Bug: 121194841
Bug: 121231426
Test: no change to out/build-aosp_sailfish.ninja
Test: forrest unbundled build
Test: forrest master apps build
Test: forrest mainline modules build
Change-Id: I45a40a335483dae2fe192721df9b31bdbab97ee5
2018-12-18 22:46:24 -08:00
Treehugger Robot
8cc51b5620 Merge changes Idb2b552b,I190bca35
* changes:
  When a stub is built for APEX, it is generated with --apex
  APEX-specific symbols can be tagged as # apex
2018-12-19 06:28:23 +00:00
Treehugger Robot
3181721a1e Merge "[hwasan] Reduce history size to save memory." 2018-12-19 06:19:58 +00:00
Evgenii Stepanov
3c5a52a477 [hwasan] Reduce history size to save memory.
Bug: 112437883
Test: adb shell echo $HWASAN_OPTIONS
Change-Id: Ifc4ab10e37efb1a0ce7ea77ad691947d24c2da2b
2018-12-18 17:02:44 -08:00
Jaewoong Jung
232c07c217 Ignore shared libs for static executables.
Ie42edc5184f315f998db953594e425214b810e0e added system_shared_libs to
static libraries so that their exported headers can be referenced.
However, it also added unrequired dependencies, which is an
error-triggering issue for static executables.

This change addresses it by adding a condition to shared libs handling code
in binary.go.

Bug: 121152570
Test: cc_test.go, library_test.go
Change-Id: I1828442c4e496f8d815fccaeca970cd5766bdf5d
2018-12-18 15:56:59 -08:00
Nicolas Geoffray
64d7f87c56 Add an owners file for dexpreopt files.
Test: N/A
Change-Id: I3d14a3cb6f0f5f8f5c0a7266285d4b8917922240
2018-12-18 20:28:06 +00:00
Nicolas Geoffray
05aa7d2d13 Fix build time preopt with shared library uses.
- Handle hidl libraries.
- Handle new shared library encoding.

Test: no mismatch preopt during boot.
bug: 117845483
bug: 111174995
Change-Id: If93dee4a208f365a9ccbbb1f73899d245282bd5b
2018-12-18 17:26:49 +00:00
Colin Cross
abbd052719 Merge "Dexpreopt soong modules inside soong"
am: 539f409d78

Change-Id: I28f9a5bf93ed423d7859ca56278132f8c5245f46
2018-12-17 18:03:05 -08:00
Colin Cross
539f409d78 Merge "Dexpreopt soong modules inside soong" 2018-12-18 01:54:32 +00:00
Colin Cross
43f08db29e Dexpreopt soong modules inside soong
Port the dexpreopt logic from Make to the dexpreopt package in Soong,
and use it to dexpreopt Soong modules.  The same package is also
compiled into the dexpreopt_gen binary to generate dexpreopt scripts
for Make modules.

This relands Ib67e2febf9ed921f06e8a86b9ec945c80dff35eb and
I462182638bd57b1367b5bfb0718e975c11ae66f7, along with multiple fixes
to depsfile generation in dexpreopt_gen that caused .odex files for
modules in defined make to be missing dependencies on boot.art, and
a fix to not dexpreopt and strip tests.

Bug: 119412419
Bug: 120273280
Test: no differences to dexpreopt outputs on aosp_sailfish system/,
      only expected changes to dexpreopt outputs on system_other
      (.vdex files for privileged Soong modules no longer incorrectly
      contain .dex contents).
Test: OUT_DIR=$PWD/out m
Test: NINJA_ARGS="-t deps out/target/product/sailfish/obj/APPS/Contacts_intermediates/dexpreopt.zip" m
Change-Id: I6bb2c971cee65d2338839753aa0d84939f335b1b
2018-12-15 19:07:54 -08:00
Jiyong Park
50ece5c430 Merge "Add installable property to apex module type"
am: ace2be498e

Change-Id: Ie5506ff5aaf10d7dcbf209bd1131ddefc15fcdb2
2018-12-15 10:07:19 -08:00
Treehugger Robot
ace2be498e Merge "Add installable property to apex module type" 2018-12-15 17:59:41 +00:00
Jiyong Park
b24226fdcc Remove -include <file> when compiling stubs.
am: 6437995170

Change-Id: I9a6d6b7b2d6498c404104d6b731b9a20b2913464
2018-12-15 09:14:05 -08:00
Jiyong Park
3fd0baf651 When a stub is built for APEX, it is generated with --apex
Now, symbols that are only to be visible to across APEXes can be tagged
as # vndk. Then when generating the stubs library, the tagged symbol
is included. The symbol is NOT included in other cases; build NDK stubs,
etc.

Bug: 120638081
Test: m (apex_test updated.)
Change-Id: Idb2b552badddfc26af113cc8d4b984788f478813
2018-12-16 02:13:14 +09:00
Jiyong Park
bb4e13536e APEX-specific symbols can be tagged as # apex
If a symbol is tagged as # apex, then it is exported when gen_stub_libs
is invoked with --apex.

Bug: 120638081
Test: python3 cc/test_gen_stub_libs.py

Change-Id: I190bca35d1a4fb422b37d1be41a34de1ad64de6b
2018-12-16 02:12:13 +09:00
Jiyong Park
6437995170 Remove -include <file> when compiling stubs.
Otherwise, the force included headers might cause conflicting types
error with the symbols in the generated stubs source code. e.g.

double acos(double); // in header
void acos() {} // in the generated source code

Bug: 120266448
Test: m (apex_test also updated, and passing)
Change-Id: I717df990959d1b24ec515f0f52a4e28b94e92f32
2018-12-15 23:03:47 +09:00
Jiyong Park
04f6a9db21 Merge changes I350fe490,I31e61862,I09b78e38
am: 1ee00b54d9

Change-Id: I2ea8c8333ecd2d48111131b6236d3005cb6f9075
2018-12-15 05:59:22 -08:00
Jiyong Park
92c0f9ce54 Add installable property to apex module type
When set to false, the apex is built but not installed. Useful for not
polluting the system image with test APEXes when doing mma.

Bug: 120960303
Test: add 'installable: false' to apex.test under system/apex/tests/Android.bp
m; check that out/..../system/apex/apex.test.apex does not exist.

Change-Id: I383d5cdcc8aec705b6a5778dbd07233471d289d0
2018-12-15 22:58:14 +09:00
Treehugger Robot
1ee00b54d9 Merge changes I350fe490,I31e61862,I09b78e38
* changes:
  Stubs libs are available for host
  Don't create unnecessary APEX variations
  Stubs dependency is not installed
2018-12-15 13:47:59 +00:00
Yi Kong
3b47a3bd02 Merge "Move -Wno-null-pointer-arithmetic to external only"
am: df76efe524

Change-Id: I71ba1b6dbd242eaf7614750076b565419ca8dae6
2018-12-14 16:44:58 -08:00
Treehugger Robot
df76efe524 Merge "Move -Wno-null-pointer-arithmetic to external only" 2018-12-15 00:29:19 +00:00
Dan Willemsen
71707a29d9 Merge "Add support for exclude_srcs in genrule"
am: 82798583d1

Change-Id: Idb4e7af06b4b38495e85d616a312fe38e5b1a507
2018-12-14 15:48:53 -08:00
Dan Willemsen
82798583d1 Merge "Add support for exclude_srcs in genrule" 2018-12-14 23:42:34 +00:00
Colin Cross
8ed785bf8b Revert "Dexpreopt soong modules inside soong"
am: 4ff85ebeb7

Change-Id: Iec9e1fb02729961b7d1a3dd1d1edcce7185cc706
2018-12-14 12:15:06 -08:00
Colin Cross
26299c4ac1 Revert "Fix MaybeRel when OUT is absolute"
am: 359e6436be

Change-Id: Ia5b5a29bba5e94b9acb6be539d1def911df31a3f
2018-12-14 12:14:59 -08:00
Colin Cross
4ff85ebeb7 Revert "Dexpreopt soong modules inside soong"
This reverts commit 29ff88741e.

Test: none
Bug: 119412419
2018-12-14 11:49:58 -08:00