aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-28 01:39:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-02-28 01:39:50 +0000
commit3b6b6b9b60e6986cfbc56287ba91440eba38b706 (patch)
tree21579fc820cfb38d62cd569dd5d2ef77568c91c1
parent4d885b9d9bfd8ef47d1f2ee9343db80bbc8c35de (diff)
parent4d8e9cecdb2d6f04a205904cf2656a4b5bf71383 (diff)
downloadqemu-snap-temp-L98200000958834796.tar.gz
Merge "Merge cherrypicks of ['android-review.googlesource.com/2457348'] into emu-32-release." into emu-32-releasesnap-temp-L98200000958834796snap-temp-L86400000958843611snap-temp-L45200000958829780snap-temp-L05300000958832464
-rw-r--r--android/emu/utils/CMakeLists.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/android/emu/utils/CMakeLists.txt b/android/emu/utils/CMakeLists.txt
index bea0464caa..31f54cdcc6 100644
--- a/android/emu/utils/CMakeLists.txt
+++ b/android/emu/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-android_add_library(
+ndroid_add_library(
TARGET android-emu-utils
# SHARED Used to test if you can compile this stand alone.
LICENSE Apache-2.0
@@ -24,7 +24,7 @@ android_add_library(
android/utils/utf8_utils.cpp
android/utils/vector.c
android/skin/rect.c
- DEPS android-emu-base android-emu-base-headers)
+ DEPS android-emu-base)
target_include_directories(android-emu-utils PRIVATE src PUBLIC include)
target_compile_definitions(android-emu-utils
PUBLIC "ANDROID_SDK_TOOLS_REVISION=${OPTION_SDK_TOOLS_REVISION}"
@@ -42,6 +42,5 @@ android_add_test(
android/utils/host_bitness_unittest.cpp android/utils/path_unittest.cpp
android/utils/Random_unittest.cpp android/utils/sockets_unittest.cpp android/skin/rect_unittest.cpp
WINDOWS android/utils/win32_cmdline_quote_unittest.cpp
- DEPS android-emu-base android-emu-base-headers android-emu-utils gtest gtest_main)
-target_include_directories(android-emu-utils_unittests PRIVATE src)
-target_compile_options(android-emu-utils_unittests PRIVATE -Wno-extern-c-compat)
+ DEPS android-emu-base android-emu-utils gtest gtest_main)
+target_include_directories(android-emu-utils_unittests PRIVATE src) \ No newline at end of file