Commit Graph

3749 Commits

Author SHA1 Message Date
Colin Cross
fe6330c7d2 Remove old-style support for translated second architectures
Translated second architectures now go in NativeBridgeArch instead
of DeviceSecondaryArch.

Bug: 141242600
Test: m checkbuild
Change-Id: I568046330abc002d4eed582cb999b62a5eaba790
2019-09-18 16:23:18 +00:00
Inseob Kim
64c4395386 Add version to vendor variants
Vendor variant is now divided into several vendor.{version} variants,
depending on their intended usages:

vendor.{BOARD_VNDK_VERSION}: vendor and vendor_available modules
vendor.{PLATFORM_VNDK_VERSION}: VNDK modules in the source tree
vendor.{snapshot_ver}: VNDK snapshot modules

This also affects exported module names from Soong to Make. But to
maintain backward compatibility, ".{BOARD_VNDK_VERSION}" suffix will not
be emitted for modules having version BOARD_VNDK_VERSION, so that vendor
modules still can be referred as-is.

Bug: 65377115
Bug: 68123344
Test: clean build and boot blueline
Change-Id: Ib9016a0f1fe06b97e9423fd95142653a89a343fa
2019-09-18 10:53:30 +09:00
Dan Shi
64fbeb187a Merge "Revert "Revert "Force gtest to use adb unroot if required_root is false or not set""" am: f7e6870f81 am: 4d4d939d76 am: c3ffcfbbc4
am: 1d52b07eed

Change-Id: Ib6592f59d7f5ae4bbac2140d91cceba1f06cc8ab
2019-09-17 17:53:38 -07:00
Treehugger Robot
f7e6870f81 Merge "Revert "Revert "Force gtest to use adb unroot if required_root is false or not set""" 2019-09-18 00:20:16 +00:00
Jooyung Han
333d0f72d6 Merge "Add "apex_vndk" module type" am: 1f6c94a3ac am: 87f0f3781c am: 49fb19f803
am: 834e9c7904

Change-Id: I2f4dfebe0d821b07633e296b6af16f43bd8de8b0
2019-09-17 10:48:19 -07:00
Treehugger Robot
1f6c94a3ac Merge "Add "apex_vndk" module type" 2019-09-17 17:14:48 +00:00
Pirama Arumuga Nainar
8611c28a81 Merge "Switch to clang-r365631b" am: b204303b35 am: 38b8fd75eb am: c6f4ea44ab
am: aba9643204

Change-Id: Ie487c46381c37f027facdcf773de0bf29fe40ee9
2019-09-17 09:55:20 -07:00
Dan Shi
bc0f26028a Revert "Revert "Force gtest to use adb unroot if required_root is false or not set""
This reverts commit 1a5eeb3e35.

Reason for revert: Fix landed in aosp/1122723

Change-Id: I8b487d602d48b9dba35affc8eb31578efd815e52
2019-09-17 02:43:50 +00:00
Pirama Arumuga Nainar
24d49119d8 Switch to clang-r365631b
Bug: https://github.com/android/ndk/issues/1076
Test: TH
Change-Id: Ica61fd13d9d7ecc742a7a89f5bb04cc6e1caf9f2
2019-09-16 15:06:41 -07:00
Julien Desprez
443c19c9fd Merge "Revert "Force gtest to use adb unroot if required_root is false or not set"" am: 74b0a4891e am: 7583b2d835 am: 1cec6d044b
am: 87bf978d9d

Change-Id: I637cde4f08cbf906fa74686ec464594a581c5cbc
2019-09-13 20:41:18 -07:00
Julien Desprez
74b0a4891e Merge "Revert "Force gtest to use adb unroot if required_root is false or not set"" 2019-09-14 03:08:57 +00:00
Julien Desprez
1a5eeb3e35 Revert "Force gtest to use adb unroot if required_root is false or not set"
This reverts commit b2cb324ce1.

Reason for revert: broke host-side test mapping

Change-Id: Iea63395d525444421fc27ef5bc660362eba11db0
2019-09-14 03:06:26 +00:00
Yi Kong
b5d6cd844c Merge "Remove use_gnu_strip option" am: d14f7b1e11 am: 89b7ee9915 am: 4c91c1c874
am: c6e2346152

Change-Id: I40bc3b332c9439f39c9e2a5b0d9a682096a01832
2019-09-13 17:06:26 -07:00
Yi Kong
d14f7b1e11 Merge "Remove use_gnu_strip option" 2019-09-13 23:22:30 +00:00
Yi Kong
ab5e514208 Remove use_gnu_strip option
This option is no longer used anywhere.

Test: presubmit
Change-Id: I1a5f2d14e24ecf7c15a437054b8a95ddaf57da2f
2019-09-13 12:18:47 -07:00
Dan Shi
95b71153ca Merge "Force gtest to use adb unroot if required_root is false or not set" am: d2ac6985e9 am: f896037e42 am: 4a558599ff
am: 1aae31942e

Change-Id: Ia08e701447965f084899e03bd4c65ebcbdfcb45b
2019-09-13 09:43:18 -07:00
Dan Shi
d2ac6985e9 Merge "Force gtest to use adb unroot if required_root is false or not set" 2019-09-13 15:55:04 +00:00
Colin Cross
482c51ebcd Merge "Add missing cortex-a76 arm configuration" am: ee3f105f25 am: 2d4be03254 am: 81438ccb9f
am: b1f6405b31

Change-Id: Ie2ed3184ddcd6112fb9ba3c1bd3390bd63e634dd
2019-09-12 16:36:04 -07:00
Pirama Arumuga Nainar
3c220171e6 Merge "Disable coverage for native-bridge modules" am: 9dab630dcb am: 449cced69a am: 646f88e634
am: cdbcbda785

Change-Id: I8587504b5360efaeffbed1fb794e7f84d8a52196
2019-09-12 16:35:13 -07:00
Colin Cross
ee3f105f25 Merge "Add missing cortex-a76 arm configuration" 2019-09-12 22:50:18 +00:00
Pirama Arumuga Nainar
5f69b9a068 Disable coverage for native-bridge modules
Bug: http://b/137883967

With coverage enabled, native-bridge modules throw a SEGV_ACCERR.

Test: Successfully run the app linked in the bug on a coverage build.
Change-Id: I9f3622b7b6d3189337c445a26d6bf81c96820c2e
2019-09-12 13:18:48 -07:00
Martin Stjernholm
f1591e38f0 Merge "Treat libclang_rt.hwasan-* the same way as the other Bionic bootstrap libs." am: 931849f36f am: 5bdc6b0f22 am: ba2b1b02e3
am: 9f30d05a37

Change-Id: I568b301ef4f0abef688268e5d2a3f831c74165c0
2019-09-12 11:27:36 -07:00
Martin Stjernholm
931849f36f Merge "Treat libclang_rt.hwasan-* the same way as the other Bionic bootstrap libs." 2019-09-12 17:55:55 +00:00
Dan Shi
b2cb324ce1 Force gtest to use adb unroot if required_root is false or not set
Bug: 140123924
Test: atest hello_world_test
Change-Id: I36fb31d274c179dc8510e08cdb5dc79601546299
2019-09-12 10:54:49 -07:00
Luca Stefani
2af7d882e8 Add missing cortex-a76 arm configuration
Change-Id: I55620e602b9e97fe7a6d36fa142ddfde77b6025b
2019-09-12 18:37:45 +02:00
Mitch Phillips
24a0127ed9 Merge "Add i386 host fuzzing support w/ cc_fuzz." am: 916f1e48dc am: 69d0cb8075 am: 17ab0433db
am: fcd4f4da58

Change-Id: I9cea7c988bbca5d496bc134bfc6da1a6cfa46205
2019-09-11 11:08:59 -07:00
Colin Cross
4e08ead52f Merge changes from topic "protobuf-3.9.1"
* changes:
  Add suffix and target.vendor.suffix to shared libraries
  Make javanano a plugin
2019-09-11 18:00:16 +00:00
Martin Stjernholm
279de572d7 Treat libclang_rt.hwasan-* the same way as the other Bionic bootstrap libs.
Ensure that it ends up in the bionic/ subdir in the Runtime APEX and is
symlinked from /system/lib(64). That makes it available in the default
(platform) linker namespace and no longer requires it to be accessible
through the runtime namespace. All this makes it consistent with how the
other Bionic libs are handled, and avoids the need for various special
cases in ld.config.txt files (to be cleaned up later).

With this there might no longer be a need for a linker namespace for the
Runtime APEX, and we could consider removing the kludge with the
/apex/com.android.runtime/${LIB}/bionic subdirectories and the special case
in getCopyManifestForNativeLibrary in apex.go. However, keeping it calls out
the special treatment of those libraries, and allows a namespace to be added
again if necessary.

Test: Build and boot on taimen_hwasan-userdebug
Test: adb shell /apex/com.android.art/bin/dexdump on taimen_hwasan-userdebug
Test: atest CtsCompilationTestCases on taimen_hwasan-userdebug
Bug: 140734238
Bug: 140790209
Change-Id: Ieb506bfa5d5c159db391273c7eba41d7909de286
2019-09-11 12:16:31 +01:00
Mitch Phillips
916f1e48dc Merge "Add i386 host fuzzing support w/ cc_fuzz." 2019-09-10 22:35:42 +00:00
Ivan Lozano
81f4fe5f76 Merge "Move splitFileExt to the android package." am: 06b9611da4 am: 34a2ac7be1 am: b36afad8e8
am: 2afbc97f8f

Change-Id: Id1bd6e6074c4fb6e50f68fc83ae1e19765993046
2019-09-10 13:14:40 -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
6e5ade8a08 Merge "Do not dedupe libprotobuf-cpp variants" am: f59007cf23 am: fe83f548ac am: 752a637f66
am: 1e87018a80

Change-Id: I7771ee3ed3ee64f6778700c13dc640fa8a510ff9
2019-09-09 18:58:58 -07:00
Treehugger Robot
f59007cf23 Merge "Do not dedupe libprotobuf-cpp variants" 2019-09-10 00:30:36 +00:00
Yi Kong
535b879b3b Merge "Remove '-Wno-return-std-move-in-c++11' flag" am: 23482a55ae am: c426b4e57f am: 488636d61f
am: d25bfddd15

Change-Id: I70f52cff371fd5f8f07c760f76f5d7adab1f0644
2019-09-09 12:34:54 -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
Justin Yun
9a171b68f8 Skip creating vendor variants for native_bridge modules am: 1282f42ed6 am: b4ce961486 am: e24b072028
am: ce07f30fb7

Change-Id: I06aca8b19d2bef695da1462c877e57085aaa52ce
2019-09-09 04:43:59 -07:00
Inseob Kim
91122142fc Merge "Remove coverage variants of vndk_prebuilt_shared" am: ee854c3226 am: 8bc65478d6 am: 0a8bd3abe5
am: f8e054177d

Change-Id: I9a3774494c273a538b06fbfce3d65be1e5b55949
2019-09-09 03:34:28 -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
eae3d83a31 Skip native_bridge modules when listing VNDK libs am: 7390ea3d79 am: 795593c7a9 am: 233f97c816
am: 949ca7d075

Change-Id: Ic79863c0a248d2e57f283c1705a998f150d92bd6
2019-09-08 18:24:54 -07:00
Justin Yun
7390ea3d79 Skip native_bridge modules when listing VNDK libs
native_bridge modules cannot be VNDK modules at the same time.

Bug: 137709824
Test: build cf_x86_64_phone
      check if llndk.libraries.*.txt has libclang_rt.asan for arm

Change-Id: I974e89b9da522e26531a576015e98dc54834282d
2019-09-08 11:34:06 +09:00
Yi Kong
866b744942 Merge "Add back the llvm-ar P flag" am: a4a8d9c115 am: 01532cc19a am: 6ff611afe8
am: e7dfc398b7

Change-Id: Ic4f5d9dcde0d425c4a951b85a9d8605338d98922
2019-09-06 21:17:31 -07:00
Yi Kong
ee96a7956a Add back the llvm-ar P flag
The P flag is supported as of llvm r354044, add back the flag to reduce
the size of intermediate archieve files. This does not affect the final
binaries.

Test: built
Bug: 71618641
Change-Id: I017780e4dcaa31c7fbe10b5e7482db1bba83e716
2019-09-06 15:11:57 -07:00
Colin Cross
0fd6a41a6d Add suffix and target.vendor.suffix to shared libraries
And make prebuilt shared libraries suffix and stem too.

This will be used for the vendor version of the protobuf
runtime shared libraries to append the protobuf version
number to the installed file name, which will help with
updating protobuf in the future.

Bug: 117607748
Test: m checkbuild
Change-Id: I8919a4f2e1be1ced29198af758077baf56c1f7a7
Merged-In: I8919a4f2e1be1ced29198af758077baf56c1f7a7
2019-09-06 14:18:01 -07:00
Colin Cross
f3922fe2ea Merge changes from topic "protobuf-3.9.1"
* changes:
  Add suffix and target.vendor.suffix to shared libraries
  Make javanano a plugin
2019-09-06 18:01:09 +00:00
Colin Cross
aa478e8709 Merge "Support boringssl hash injection on binaries and make it transitive" am: a758d6c881 am: 57660b75ea am: 747a3e1593 am: ee19a65184
am: 66a023e3b0

Change-Id: I10ef77cd28c8b5a387bbb8543dc70c3d69cb4c05
2019-09-05 21:59:11 -07:00