Fix android compile problem.

apache · May 28, 2019 · 734b282 · 734b282
1 parent 01f964e
commit 734b282
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -239,11 +239,11 @@ if(file('../license/LICENSE').exists()){
                          'Source/android/jniprebuild/jniheader/*.h',
                          'Source/base/Compatible.cpp',
                          'Source/IPC/**/*.h','Source/IPC/**/*.cpp', 'Source/IPC/**/*.c',
-                         'weex_core/Source/android/jsengine/dependence/**/*.h',
-                         'weex_core/Source/android/jsengine/dependence/**/*.cpp',
-                         'weex_core/Source/include/wtf/Optional.h',
-                         'weex_core/Source/include/wtf/Brigand.h',
-                         'weex_core/Source/include/wtf/Variant.h'])
+                         'Source/android/jsengine/dependence/**/*.h',
+                         'Source/android/jsengine/dependence/**/*.cpp',
+                         'Source/include/wtf/Optional.h',
+                         'Source/include/wtf/Brigand.h',
+                         'Source/include/wtf/Variant.h'])
     }
     preBuild.dependsOn licenseFormat
 }

diff --git a/weex_core/Source/base/CMakeLists.txt b/weex_core/Source/base/CMakeLists.txt
@@ -69,6 +69,7 @@ set(${BASE_LIBRARY_NAME}_SOURCES
     )
 
 if (ANDROID)
+    add_definitions(-DOS_ANDROID=1)
     if ("${ANDROID_ABI}" STREQUAL "x86")
     else ()
       list(APPEND ${BASE_LIBRARY_NAME}_SOURCES