Skip to content

S
swiftshader
Commit 62cfbb9c by Greg Hartman
Options

Resolve conflicts on Android.bp/.mk when building with O

BUG: 113551166 Change-Id: I0646638710abfc84707ca42faea10f94c87c1f4b Test: oc and pi build and boot Reviewed-on: https://swiftshader-review.googlesource.com/20329Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent d5411c81
Showing with 12 additions and 0 deletions
src/Android.bp
...@@ -188,6 +188,7 @@ cc_defaults { ...@@ -188,6 +188,7 @@ cc_defaults {
name: "libswiftshader_subzero_defaults", name: "libswiftshader_subzero_defaults",
defaults: [ "libswiftshader_common_defaults", "swiftshader_subzero" ], defaults: [ "libswiftshader_common_defaults", "swiftshader_subzero" ],
device_supported: false,
srcs: [ srcs: [
"Reactor/SubzeroReactor.cpp", "Reactor/SubzeroReactor.cpp",
...@@ -219,10 +220,12 @@ cc_library_static { ...@@ -219,10 +220,12 @@ cc_library_static {
name: "libswiftshader_llvm", name: "libswiftshader_llvm",
defaults: [ "libswiftshader_common", "libswiftshader_llvm_defaults" ], defaults: [ "libswiftshader_common", "libswiftshader_llvm_defaults" ],
device_supported: false,
} }
cc_library_static { cc_library_static {
name: "libswiftshader_llvm_debug", name: "libswiftshader_llvm_debug",
device_supported: false,
defaults: [ "libswiftshader_common_debug", "libswiftshader_llvm_defaults" ], defaults: [ "libswiftshader_common_debug", "libswiftshader_llvm_defaults" ],
} }
...@@ -231,10 +234,12 @@ cc_library_static { ...@@ -231,10 +234,12 @@ cc_library_static {
name: "libswiftshader_subzero", name: "libswiftshader_subzero",
defaults: [ "libswiftshader_common", "libswiftshader_subzero_defaults" ], defaults: [ "libswiftshader_common", "libswiftshader_subzero_defaults" ],
device_supported: false,
} }
cc_library_static { cc_library_static {
name: "libswiftshader_subzero_debug", name: "libswiftshader_subzero_debug",
device_supported: false,
defaults: [ "libswiftshader_common_debug", "libswiftshader_subzero_defaults" ], defaults: [ "libswiftshader_common_debug", "libswiftshader_subzero_defaults" ],
} }
...@@ -392,6 +397,7 @@ cc_library_shared { ...@@ -392,6 +397,7 @@ cc_library_shared {
"libEGL_swiftshader_defaults", "libEGL_swiftshader_defaults",
"swiftshader_client_libraries_subzero_or_llvm", "swiftshader_client_libraries_subzero_or_llvm",
], ],
device_supported: false,
} }
cc_library_shared { cc_library_shared {
...@@ -401,6 +407,7 @@ cc_library_shared { ...@@ -401,6 +407,7 @@ cc_library_shared {
"libEGL_swiftshader_defaults", "libEGL_swiftshader_defaults",
"swiftshader_client_libraries_subzero_or_llvm_debug", "swiftshader_client_libraries_subzero_or_llvm_debug",
], ],
device_supported: false,
} }
// libGLESv1_CM libraries // libGLESv1_CM libraries
...@@ -444,6 +451,7 @@ cc_library_shared { ...@@ -444,6 +451,7 @@ cc_library_shared {
"libGLESv1_CM_swiftshader_defaults", "libGLESv1_CM_swiftshader_defaults",
"swiftshader_client_libraries_subzero_or_llvm", "swiftshader_client_libraries_subzero_or_llvm",
], ],
device_supported: false,
} }
cc_library_shared { cc_library_shared {
...@@ -453,6 +461,7 @@ cc_library_shared { ...@@ -453,6 +461,7 @@ cc_library_shared {
"libGLESv1_CM_swiftshader_defaults", "libGLESv1_CM_swiftshader_defaults",
"swiftshader_client_libraries_subzero_or_llvm_debug", "swiftshader_client_libraries_subzero_or_llvm_debug",
], ],
device_supported: false,
} }
// libGLESv2 libraries // libGLESv2 libraries
...@@ -461,6 +470,7 @@ cc_defaults { ...@@ -461,6 +470,7 @@ cc_defaults {
name: "libGLESv2_swiftshader_defaults", name: "libGLESv2_swiftshader_defaults",
defaults: [ "libswiftshader" ], defaults: [ "libswiftshader" ],
device_supported: false,
cflags: [ cflags: [
"-DLOG_TAG=\"libGLESv2_swiftshader\"", "-DLOG_TAG=\"libGLESv2_swiftshader\"",
...@@ -504,6 +514,7 @@ cc_library_shared { ...@@ -504,6 +514,7 @@ cc_library_shared {
"libGLESv2_swiftshader_defaults", "libGLESv2_swiftshader_defaults",
"swiftshader_client_libraries_subzero_or_llvm", "swiftshader_client_libraries_subzero_or_llvm",
], ],
device_supported: false,
static_libs: [ "libswiftshader_compiler" ], static_libs: [ "libswiftshader_compiler" ],
} }
...@@ -515,6 +526,7 @@ cc_library_shared { ...@@ -515,6 +526,7 @@ cc_library_shared {
"libGLESv2_swiftshader_defaults", "libGLESv2_swiftshader_defaults",
"swiftshader_client_libraries_subzero_or_llvm_debug", "swiftshader_client_libraries_subzero_or_llvm_debug",
], ],
device_supported: false,
static_libs: [ "libswiftshader_compiler_debug" ], static_libs: [ "libswiftshader_compiler_debug" ],
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment