Merge "Revert "bionic_libc_platform_headers is only available when buil...""... (eb648a19) · Commits · e / os / android_system_core

libunwindstack/Android.bp

+18 −33

Original line number	Diff line number	Diff line
		@@ -75,29 +75,13 @@ cc_defaults {
		],

		target: {
		host: {
		// Always disable optimizations for host to make it easier to debug.
		host: {
		cflags: [
		"-O0",
		"-g",
		],
		},
		android: {
		header_libs: ["bionic_libc_platform_headers"],
		product_variables: {
		experimental_mte: {
		cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
		},
		},
		},
		linux_bionic: {
		header_libs: ["bionic_libc_platform_headers"],
		product_variables: {
		experimental_mte: {
		cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
		},
		},
		},
		},

		arch: {
		@@ -118,6 +102,16 @@ cc_defaults {
		"liblog",
		"liblzma",
		],

		header_libs: [
		"bionic_libc_platform_headers",
		],

		product_variables: {
		experimental_mte: {
		cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
		},
		},
		}

		cc_library {
		@@ -287,24 +281,15 @@ cc_defaults {
		"tests/files/offline/straddle_arm64/*",
		],

		target: {
		android: {
		header_libs: ["bionic_libc_platform_headers"],
		product_variables: {
		experimental_mte: {
		cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
		},
		},
		},
		linux_bionic: {
		header_libs: ["bionic_libc_platform_headers"],
		header_libs: [
		"bionic_libc_platform_headers",
		],

		product_variables: {
		experimental_mte: {
		cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
		},
		},
		},
		},
		}

		cc_test {

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@

		#include <android-base/file.h>
		#include <android-base/test_utils.h>
		#include <bionic/mte.h>
		#include <bionic/mte_kernel.h>
		#include <gtest/gtest.h>

		#include "MemoryRemote.h"