summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-10-17 04:58:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-17 04:58:47 +0000
commit1216c7fc80727dea7cb9c5f946688f4b98ccd23c (patch)
tree1336ee5c38e6e231f8c33407a49336e8ea8b0183
parentebf5c6974c6cc5e150e123564846a3cf1d5b22fe (diff)
parentb5fcddee13aefa05b8b03f27462cda5d7d01733b (diff)
downloadlibchrome-1216c7fc80727dea7cb9c5f946688f4b98ccd23c.tar.gz
Use target.linux for all linux kernel based targets am: b60f75f6bb am: 17dead5d3a
am: b5fcddee13 Change-Id: If4298e58105af7baacb50f91d817c5b5ab6de504
-rw-r--r--Android.bp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 9f7da860c9..5aa23aa6f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -311,8 +311,11 @@ cc_library {
"libgtest_prod",
],
target: {
+ linux: {
+ srcs: libchromeLinuxSrc,
+ },
android: {
- srcs: libchromeLinuxSrc + [
+ srcs: [
"base/memory/shared_memory_android.cc",
"base/sys_info_chromeos.cc",
],
@@ -322,7 +325,7 @@ cc_library {
],
},
linux_glibc: {
- srcs: libchromeLinuxSrc + [
+ srcs: [
"base/allocator/allocator_shim.cc",
"base/allocator/allocator_shim_default_dispatch_to_glibc.cc"
],