Commit Graph

15828 Commits

Author SHA1 Message Date
Treehugger Robot
84bd071cac Merge "Create flattened variants for soong apex module" 2019-09-11 05:18:34 +00:00
Logan Chien
a114787561 Merge "apex: Install nativeTest with soong_cc_prebuilt.mk" am: 4b9f4d6ea0
am: 0a7b3e2383

Change-Id: I37abfe1184e4c7b281d420eb45ca7da7e7d49c8b
2019-09-10 19:47:32 -07:00
Logan Chien
0a7b3e2383 Merge "apex: Install nativeTest with soong_cc_prebuilt.mk"
am: 4b9f4d6ea0

Change-Id: I13e20eb94519c34dc06eb27b1b4acf02498e8ac9
2019-09-10 19:40:27 -07:00
Treehugger Robot
4b9f4d6ea0 Merge "apex: Install nativeTest with soong_cc_prebuilt.mk" 2019-09-11 02:28:53 +00:00
Sundong Ahn
e9b5572cbf Create flattened variants for soong apex module
The apexBundle module is mutated flattened variant and unflattened
variant. So we can install flattened apex and unflattened apex at the
same time with adding {Apex module name}.flattened to PRODUCT_PACKAGES.

Bug: 139716748
Test: m -j && Add com.android.art.debug.flattened to PRODUCT PACAGES and
check system/apex/com.android.art.debug directory

Change-Id: I0d8c9a155e47c5d0ff13e2f55d4080d91ef5093d
2019-09-11 10:47:12 +09:00
Colin Cross
5d0531cb50 Merge "Make additional manifests transitive" am: c706a186cc
am: 0dfed47e18

Change-Id: Ife247305d647e037f5d5e40e67530c9d99844fa2
2019-09-10 18:01:12 -07:00
Colin Cross
0dfed47e18 Merge "Make additional manifests transitive"
am: c706a186cc

Change-Id: Iaa8348152fcc3c3792ada13e9d1871889de51c5d
2019-09-10 17:54:37 -07:00
Colin Cross
c706a186cc Merge "Make additional manifests transitive" 2019-09-11 00:31:28 +00:00
Mitch Phillips
17ab0433db Merge "Add i386 host fuzzing support w/ cc_fuzz." am: 916f1e48dc
am: 69d0cb8075

Change-Id: I53887a83685d1f0f64dd75131009c8fdb63f3820
2019-09-10 15:49:03 -07:00
Mitch Phillips
69d0cb8075 Merge "Add i386 host fuzzing support w/ cc_fuzz."
am: 916f1e48dc

Change-Id: I4fc6bc9ac04d854e615d6b35cd52f90250d8a412
2019-09-10 15:42:23 -07:00
Mitch Phillips
916f1e48dc Merge "Add i386 host fuzzing support w/ cc_fuzz." 2019-09-10 22:35:42 +00:00
Luca Stefani
fd89882a37 Make additional manifests transitive
Test: m, additional_manifests is now transitive
Change-Id: I3134c5e942959fe762024602fd833ec4a4312d2c
2019-09-10 22:47:53 +02:00
Ivan Lozano
b36afad8e8 Merge "Move splitFileExt to the android package." am: 06b9611da4
am: 34a2ac7be1

Change-Id: I64d1c8494e3290d245ce79195856d3560d8ad2be
2019-09-10 12:57:15 -07:00
Ivan Lozano
34a2ac7be1 Merge "Move splitFileExt to the android package."
am: 06b9611da4

Change-Id: Ifa1f14674d3c1f2e52827c2a873d72626c85d415
2019-09-10 12:50:18 -07:00
Ivan Lozano
06b9611da4 Merge "Move splitFileExt to the android package." 2019-09-10 19:38:20 +00:00
Matthew Maurer
2d1c8a76a0 Merge "Update to Rust 1.37.0" am: 186570d7fa
am: 5acee47020

Change-Id: I8a1330d8985cc866556bcfd2620f404a4bb7aecb
2019-09-10 11:05:01 -07:00
Matthew Maurer
5acee47020 Merge "Update to Rust 1.37.0"
am: 186570d7fa

Change-Id: I658338240e9228b611acb0693959d09d22d686e4
2019-09-10 10:57:06 -07:00
Matthew Maurer
186570d7fa Merge "Update to Rust 1.37.0" 2019-09-10 17:43:25 +00:00
Logan Chien
0342c58262 apex: Install nativeTest with soong_cc_prebuilt.mk
This commit switches the build rule for APEX nativeTests from
`$(BUILD_PREBUILT)` to `soong_cc_prebuilt.mk`.  Since these are not real
prebuilts, `soong_cc_prebuilt.mk` should be sufficient.

Using `soong_cc_prebuilt.mk` also fixes a problem reported by prebuilt
ELF checker because `LOCAL_SHARED_LIBRARIES` are not generated for
nativeTests.

Bug: 139525855
Test: lunch aosp_walleye-userdebug && make check-elf-files
Change-Id: I7bfc29f9c2708896dad4e7cfc214480e1205a51e
2019-09-10 09:59:18 -07:00
Ivan Lozano
022a73b9ad Move splitFileExt to the android package.
Both Rust and cc use this function, so move it over to android
package's util.go and export it.

Bug: 140734195
Test: m -j

Change-Id: Ibe8b7a94592e402468a027ad6027b187f29c8e07
2019-09-09 20:29:31 -07:00
Jooyung Han
344d5439c1 Add "apex_vndk" module type
"apex_vndk" is a variant of "apex" module.

apex_vndk {
  name: "com.android.vndk",
  ..
}

This rule is used to produce a VNDK APEX per vndk version.
It supports automatic inclusion of vndk libs.

If "vndk_version" property is set, the prebuilt vndk libs of
the version will be included in the apex bundle.

apex_vndk {
  name: "com.android.vndk.v29"
  vndk_version: "29",
  ...
}

Otherwise, platform's vndk version is used.

This will replace /system/{lib}/vndk-{ver} and vndk-sp-{ver}.

Bug: 134357236
Bug: 139772411
Test: m com.android.vndk
Change-Id: Ib5c86e625839389670d13c683a7427198ef6852f
2019-09-10 11:22:59 +09:00
Vic Yang
752a637f66 Merge "Do not dedupe libprotobuf-cpp variants" am: f59007cf23
am: fe83f548ac

Change-Id: I35ae1112e2e9f075b32a6a55a4ab6cf41490b215
2019-09-09 18:11:31 -07:00
Vic Yang
fe83f548ac Merge "Do not dedupe libprotobuf-cpp variants"
am: f59007cf23

Change-Id: I672490f75c243305a2d73cff73d4f5af068ae09e
2019-09-09 18:06:27 -07:00
Treehugger Robot
f59007cf23 Merge "Do not dedupe libprotobuf-cpp variants" 2019-09-10 00:30:36 +00:00
Matthew Maurer
43f697ec28 Update to Rust 1.37.0
Test: m crosvm.experimental
Bug: 140573584
Change-Id: I52d33b1ed4610536c89471e2052dea07b1b4ff8f
2019-09-09 16:17:33 -07:00
Greg Kaiser
64ae76dc85 Merge "strip.sh: Fix argument to llvm-strip" am: f56e89f160
am: bb25e168f3

Change-Id: Ia482420c954b80b584654a7f89ab3abf1eaa3185
2019-09-09 15:30:46 -07:00
Greg Kaiser
bb25e168f3 Merge "strip.sh: Fix argument to llvm-strip"
am: f56e89f160

Change-Id: Id18a9e1e92afa1753cc8ac1584684aac51e98727
2019-09-09 15:20:04 -07:00
Treehugger Robot
f56e89f160 Merge "strip.sh: Fix argument to llvm-strip" 2019-09-09 22:06:56 +00:00
Yi Kong
488636d61f Merge "Remove '-Wno-return-std-move-in-c++11' flag" am: 23482a55ae
am: c426b4e57f

Change-Id: I2f8afac9ba445eb03e07dfa11941c75b94edc30a
2019-09-09 12:19:31 -07:00
Yi Kong
c426b4e57f Merge "Remove '-Wno-return-std-move-in-c++11' flag"
am: 23482a55ae

Change-Id: Ibd16b7c239fe938beb86b8f47f47a0851df8760c
2019-09-09 12:12:00 -07:00
Yi Kong
23482a55ae Merge "Remove '-Wno-return-std-move-in-c++11' flag" 2019-09-09 18:48:23 +00:00
Yi Kong
751569192c Remove '-Wno-return-std-move-in-c++11' flag
This flag is no longer needed.

Test: presubmit
Change-Id: I9718ea1d448a6f598e6da61c3b30a0c9470d9c08
2019-09-09 18:48:15 +00:00
Vic Yang
7f438b1df3 Do not dedupe libprotobuf-cpp variants
The vendor variants of libprotobuf-cpp have their version numbers
included in their names, so the SONAME field is different.  Whitelist
the 'lite' and 'full' versions to have different core and vendor
variants.

Test: Build a device with TARGET_VNDK_USE_CORE_VARIANT set.
Change-Id: I9880a5d7172a9f35f304af8e7dcababdcbc2ca23
2019-09-09 10:54:50 -07:00
Colin Cross
68cd62be18 Merge "Use prebuilts for more tools in unbundled builds" am: 6617b6d624
am: 98db83a967

Change-Id: I2886faf31d4f102b46da7b7cc24f368b0298f7eb
2019-09-09 10:46:25 -07:00
Steven Moreland
fa98ef2cc1 Merge "CreateModule also inherits variableProperties." am: ed329ceab1
am: d759b56fb4

Change-Id: I9b88e6abaec2adc05653c0c5029b0a8f3e88b102
2019-09-09 10:46:05 -07:00
Colin Cross
98db83a967 Merge "Use prebuilts for more tools in unbundled builds"
am: 6617b6d624

Change-Id: Iaeea70c533487b827c3d3ed74d61ebd8b01b2069
2019-09-09 10:39:24 -07:00
Steven Moreland
d759b56fb4 Merge "CreateModule also inherits variableProperties."
am: ed329ceab1

Change-Id: Iaa5e44cffa796c16f18475d9212b49b95436e8d3
2019-09-09 10:39:01 -07:00
Colin Cross
6617b6d624 Merge "Use prebuilts for more tools in unbundled builds" 2019-09-09 17:21:44 +00:00
Treehugger Robot
ed329ceab1 Merge "CreateModule also inherits variableProperties." 2019-09-09 17:16:22 +00:00
Greg Kaiser
e106d8fd8c strip.sh: Fix argument to llvm-strip
We had a typo in the original checkin.  We need two hypens before
"remove-section" for llvm-strip, just like we have for strip.

Bug: 140721128
Test: Clean build of Go device
Change-Id: Ifb83dc4e6ad8f8070d9ced678f9147d6a040aee7
2019-09-09 09:55:07 -07:00
Justin Yun
e24b072028 Skip creating vendor variants for native_bridge modules am: 1282f42ed6
am: b4ce961486

Change-Id: Ibbbda7ed9645ceb91bb5fbb0bd009f09c393be7e
2019-09-09 04:29:57 -07:00
Justin Yun
b4ce961486 Skip creating vendor variants for native_bridge modules
am: 1282f42ed6

Change-Id: Ia64f3b40220bebf429cf9032e4700d64a11576a7
2019-09-09 04:23:01 -07:00
Inseob Kim
0a8bd3abe5 Merge "Remove coverage variants of vndk_prebuilt_shared" am: ee854c3226
am: 8bc65478d6

Change-Id: I700332c6ef5470f23b97c859c8e0ecfdd2c7cefb
2019-09-09 03:20:44 -07:00
Inseob Kim
8bc65478d6 Merge "Remove coverage variants of vndk_prebuilt_shared"
am: ee854c3226

Change-Id: I3d3406a84a02933982d777f08df46537206a6b76
2019-09-09 03:13:45 -07:00
Justin Yun
1282f42ed6 Skip creating vendor variants for native_bridge modules
native_bridge modules may not have vendor variants because they are
used only for native_loader.

Bug: 140702618
Bug: 137709824
Test: lunch aosp_cf_x86_phone-userdebug && make
Change-Id: Ic9f4abff22597693e66eef520cd1101b5e8c8938
2019-09-09 09:54:03 +00:00
Inseob Kim
ee854c3226 Merge "Remove coverage variants of vndk_prebuilt_shared" 2019-09-09 09:50:34 +00:00
Inseob Kim
c9fa4a3247 Remove coverage variants of vndk_prebuilt_shared
vndk_prebuilt_shared is also one of prebuilt modules, so coverage
variants shouldn't be created.

Bug: 128524141
Test: m NATIVE_COVERAGE=true COVERAGE_PATHS=*
Change-Id: I586651c6775a6ae23dc0412ec5538eefd8e92dde
2019-09-09 10:54:05 +09:00
Justin Yun
233f97c816 Skip native_bridge modules when listing VNDK libs am: 7390ea3d79
am: 795593c7a9

Change-Id: I4c5c127dd761b5df56516f285f559121de569ae2
2019-09-08 18:10:34 -07:00
Justin Yun
795593c7a9 Skip native_bridge modules when listing VNDK libs
am: 7390ea3d79

Change-Id: Ia147a4eae0352e4ad1062d8c079288559ff78bbd
2019-09-08 18:04:33 -07:00
Xin Li
c0c04685b3 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ifc81184a113f1f41d1dccfc0e6cd04c6791dcfdb
Merged-In: Ic676d1c55807ac806a18ce8b9f845bfccb0ffa26
2019-09-08 13:12:49 -07:00