[[ API 26 ]] Add api version to prebuilt lib paths

livecodeali · livecodeali · commit 95ede13faa6c · 2018-06-19T21:37:25.000+01:00
diff --git a/config.py b/config.py
@@ -414,16 +414,20 @@ def validate_android_tools(opts):
     if opts['ANDROID_NDK_VERSION'] is None:
         opts['ANDROID_NDK_VERSION'] = 'r15'
 
-    ndk_ver = opts['ANDROID_NDK_VERSION']
-    if opts['ANDROID_PLATFORM'] is None:
-        opts['ANDROID_PLATFORM'] = 'android-26'
+    ndk_ver = opts['ANDROID_NDK_VERSION']     
 
     if opts['ANDROID_NDK'] is None:
         ndk = guess_android_tooldir('android-ndk')
         if ndk is None:
             error('Android NDK not found; set $ANDROID_NDK')
         opts['ANDROID_NDK'] = ndk
 
+    if opts['ANDROID_API_VERSION'] is None:
+        opts['ANDROID_API_VERSION'] = '26'
+     
+    if opts['ANDROID_PLATFORM'] is None:
+        opts['ANDROID_PLATFORM'] = 'android-26'   
+
     if opts['ANDROID_SDK'] is None:
         sdk = guess_android_tooldir('android-sdk')
         if sdk is None:
@@ -532,6 +536,7 @@ def configure_android(opts):
 
     export_opts(opts, ('ANDROID_BUILD_TOOLS', 'ANDROID_NDK',
                        'ANDROID_PLATFORM', 'ANDROID_SDK',
+                       'ANDROID_API_VERSION',
                        'JAVA_SDK', 'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY',
                        'OBJDUMP', 'STRIP'))
     args = core_gyp_args(opts) + ['-Dtarget_arch=' + opts['TARGET_ARCH'],
diff --git a/config/android.gypi b/config/android.gypi
@@ -8,6 +8,7 @@
 			'java_sdk_path%': '<!(echo ${JAVA_SDK})',
 			'android_sdk_path%': '<!(echo ${ANDROID_SDK})',
 			'android_ndk_path%': '<!(echo ${ANDROID_NDK})',
+			'android_api_version%': '<!(echo ${ANDROID_API_VERSION})',			
 			'android_platform%': '<!(echo ${ANDROID_PLATFORM})',
 			'android_build_tools%': '<!(echo ${ANDROID_BUILD_TOOLS})',
 		},
diff --git a/docs/development/build-android.md b/docs/development/build-android.md
@@ -68,7 +68,7 @@ TRIPLE=arm-linux-androideabi
 TOOLCHAIN=${HOME}/android/toolchain # Edit me!
 
 # Java SDK
-JAVA_SDK=/usr/lib/jvm/java-7-openjdk-amd64/ # Edit me!
+JAVA_SDK=/usr/lib/jvm/java-8-openjdk-amd64/ # Edit me!
 
 # Build tools
 BINDIR=$TOOLCHAIN/standalone/bin
@@ -81,16 +81,17 @@ AR="${BINDIR}/${TRIPLE}-ar"
 
 # Android platform information
 ANDROID_NDK_VERSION=r15
-ANDROID_PLATFORM=android-26
-ANDROID_NDK=${TOOLCHAIN}/android-ndk-r15
+ANDROID_API_VERSION=26
+ANDROID_PLATFORM=android-${ANDROID_API_VERSION}
+ANDROID_NDK=${TOOLCHAIN}/android-ndk-${ANDROID_NDK_VERSION}
 ANDROID_SDK=${TOOLCHAIN}/android-sdk-linux
 ANDROID_BUILD_TOOLS=27.0.3
 ANDROID_LIB_PATH=${TOOLCHAIN}/standalone/${TRIPLE}/lib
 
 export JAVA_SDK
 export CC CXX LINK AR
 export ANDROID_PLATFORM ANDROID_NDK ANDROID_SDK ANDROID_BUILD_TOOLS
-export ANDROID_LIB_PATH
+export ANDROID_LIB_PATH ANDROID_API_VERSION
 ````
 
 ### Generating makefiles
diff --git a/prebuilt/libicu.gyp b/prebuilt/libicu.gyp
@@ -179,7 +179,7 @@
 							# Gyp doesn't seem to handle non-absolute paths here properly...
 							'library_dirs':
 							[
-								'lib/android/<(target_arch)',
+								'lib/android/<(target_arch)/api<(android_api_version)',
 							],
 							
 							'libraries':
diff --git a/prebuilt/libopenssl.gyp b/prebuilt/libopenssl.gyp
@@ -121,7 +121,7 @@
 						{
 							'library_dirs':
 							[
-								'lib/android/<(target_arch)',
+								'lib/android/<(target_arch)/api<(android_api_version)',
 							],
 							
 							'libraries':

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@`
`179`	`179`	`# Gyp doesn't seem to handle non-absolute paths here properly...`
`180`	`180`	`'library_dirs':`
`181`	`181`	`[`
`182`		`- 'lib/android/<(target_arch)',`
	`182`	`+ 'lib/android/<(target_arch)/api<(android_api_version)',`
`183`	`183`	`],`
`184`	`184`
`185`	`185`	`'libraries':`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@`
`121`	`121`	`{`
`122`	`122`	`'library_dirs':`
`123`	`123`	`[`
`124`		`- 'lib/android/<(target_arch)',`
	`124`	`+ 'lib/android/<(target_arch)/api<(android_api_version)',`
`125`	`125`	`],`
`126`	`126`
`127`	`127`	`'libraries':`