Fix the specification of the Android library path

Fraser J. Gordon · livecodeian · commit b1b9c1da4d0b · 2018-06-18T08:47:29.000+01:00
The case of an empty library path (e.g. when using a standalone Android
toolchain) was not handled properly and could cause strange linker errors.
diff --git a/config/android-settings.gypi b/config/android-settings.gypi
@@ -2,7 +2,7 @@
 	'variables':
 	{
 		'c++_std': '<!(echo ${CXX_STD:-c++11})',
-		'android_lib_path%': '<!(echo ${ANDROID_LIB_PATH})',
+		'android_lib_path%': '<!(echo ${ANDROID_LIB_PATH:+-L${ANDROID_LIB_PATH}})',
 	},
 
 	'cflags':
@@ -36,7 +36,7 @@
 			{
 				'ldflags':
 				[
-					'-L<(android_lib_path)',
+					'<(android_lib_path)',
 					'-lstdc++',
 				],
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`'variables':`
`3`	`3`	`{`
`4`	`4`	`'c++_std': '<!(echo ${CXX_STD:-c++11})',`
`5`		`- 'android_lib_path%': '<!(echo ${ANDROID_LIB_PATH})',`
	`5`	`+ 'android_lib_path%': '<!(echo ${ANDROID_LIB_PATH:+-L${ANDROID_LIB_PATH}})',`
`6`	`6`	`},`
`7`	`7`
`8`	`8`	`'cflags':`
`@@ -36,7 +36,7 @@`
`36`	`36`	`{`
`37`	`37`	`'ldflags':`
`38`	`38`	`[`
`39`		`- '-L<(android_lib_path)',`
	`39`	`+ '<(android_lib_path)',`
`40`	`40`	`'-lstdc++',`
`41`	`41`	`],`
`42`	`42`