Commit Graph

3527 Commits

Author SHA1 Message Date
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
Colin Cross
d7227f99eb Support boringssl hash injection on binaries and make it transitive
Move handling the inject_bssl_hash property to a helper function,
and also treat it as set if any static libraries have it set.

Bug: 137267623
Test: m checkbuild
Change-Id: Icb12cfffb20797c807b410daffbf7fcccb1b1975
2019-09-05 15:30:05 -07:00
Mitch Phillips
4de896e1ef Add i386 host fuzzing support w/ cc_fuzz.
Adds the host fuzzing support back for 32-bit x86 targets, now that the
toolchain has been updated to export this library.

Bug: 133261679
Test: `m example_fuzzer` on a 32-bit target/cross
Change-Id: I28285d531a53eebd28c9e1b733035be48696b48f
2019-09-05 13:34:44 -07:00
Colin Cross
3ada0befe8 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
2019-09-04 12:48:02 -07:00
Yi Kong
a49fc6beae Merge "Re-enable tautological-unsigned-enum-zero-compare" am: 47236f13fc am: 38e5eacedc am: b9dc979980 am: 12eafc1908
am: f696f96746

Change-Id: Id2720b05e5643076a7023ed708463dbd0cb76a46
2019-09-03 16:48:52 -07:00
Yi Kong
38e5eacedc Merge "Re-enable tautological-unsigned-enum-zero-compare"
am: 47236f13fc

Change-Id: I4def4ff498f48dfff56709b1f8dd28fbe4fad408
2019-09-03 14:50:24 -07:00
Treehugger Robot
47236f13fc Merge "Re-enable tautological-unsigned-enum-zero-compare" 2019-09-03 21:29:54 +00:00
Martin Stjernholm
242d9ed1ca Update dexpreopt for the ART APEX name change.
am: cc4b0ad706

Change-Id: I925557842275381d5a8754771a39cf72821628f0
2019-09-02 03:43:53 -07:00
Yi Kong
8ca12bd837 Re-enable tautological-unsigned-enum-zero-compare
Clang is smarter at producing this new warning now, producing far
fewer false positives. Re-enable the diagnostic for Android.

Test: build
Bug: 72331526
Change-Id: Ide827791c51587bceb977ae4116894a8cd620eb1
2019-09-01 14:11:01 -07:00
Martin Stjernholm
cc4b0ad706 Update dexpreopt for the ART APEX name change.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: I3aac9112b022cce3ef8cfdf4bdbbed8bb0c8f4c7
Merged-In: I3aac9112b022cce3ef8cfdf4bdbbed8bb0c8f4c7
2019-08-30 17:47:30 +01:00
Jiyong Park
115e49379c Merge "Automatically enable abi checker for the stub libs" am: c61c83db9a am: 777050e48e am: 93133d1b20 am: 277742fee0
am: 8755aa7089

Change-Id: I74847a4bf43bf8d4a2e61ad2fc7a9402933daf69
2019-08-29 23:44:02 -07:00
Jiyong Park
777050e48e Merge "Automatically enable abi checker for the stub libs"
am: c61c83db9a

Change-Id: I44b7eebdd0b2ac55b55c4b0f2fa1448bdf80ba9d
2019-08-29 23:10:19 -07:00
Treehugger Robot
c61c83db9a Merge "Automatically enable abi checker for the stub libs" 2019-08-30 05:29:23 +00:00
Yi Kong
e4f4b2648c Merge "Re-enable tautological-unsigned-zero-compare" am: 73e2125894 am: 09c3304fe4 am: 7231c4a615 am: 10048a30c7
am: e6340247fc

Change-Id: I06bce2f53f1945fadd59d6198a728f458fa36d3f
2019-08-29 19:46:43 -07:00
Yi Kong
09c3304fe4 Merge "Re-enable tautological-unsigned-zero-compare"
am: 73e2125894

Change-Id: I12b004231a9f19a85f8afb9d0ac1d78bf6a50cac
2019-08-29 19:05:03 -07:00
Yi Kong
73e2125894 Merge "Re-enable tautological-unsigned-zero-compare" 2019-08-30 01:44:27 +00:00
Mitch Phillips
c121e99483 Merge "Disable FORTIFY for fuzzer builds." am: 1e7f14b1d5 am: 586b8a2042 am: 93b63f6cf2 am: 09b2272c62
am: 009a5fa238

Change-Id: If00560c58bc53ad63ca4c3089394fb9f6888809b
2019-08-29 10:49:00 -07:00
Mitch Phillips
586b8a2042 Merge "Disable FORTIFY for fuzzer builds."
am: 1e7f14b1d5

Change-Id: Ifa6d2c356181af8005e8df12801141b17e5b99ae
2019-08-29 10:10:17 -07:00
Treehugger Robot
1e7f14b1d5 Merge "Disable FORTIFY for fuzzer builds." 2019-08-29 17:00:20 +00:00
Dan Shi
f105456cc0 Merge "Add option disable_framework for auto-generated test config" am: e7eb842bbb am: f11508a94f am: dede4f07b3 am: 8b8b7ae163
am: 854e2b4b3e

Change-Id: I552254eb780ce29edf6e31b7ba9695344d1ee558
2019-08-28 22:52:18 -07:00
Dan Shi
f11508a94f Merge "Add option disable_framework for auto-generated test config"
am: e7eb842bbb

Change-Id: I0f78c37159c19db327560f6473de78177231f746
2019-08-28 22:28:13 -07:00
Dan Shi
e7eb842bbb Merge "Add option disable_framework for auto-generated test config" 2019-08-29 05:18:20 +00:00
Dan Willemsen
45b3de5f61 Merge "Disallow __DATE__/__TIME__ on host builds" am: 63cce39166 am: ce33a3546c am: 548535f970 am: b0229c99f7
am: 8ea3e4e425

Change-Id: I88b019576ff3d33514b192f53c8b07d4ca4f9392
2019-08-28 20:08:00 -07:00