Merge "frameworks/base: Update a few more references to android.jar." am: 85e68063a9
am: 52e98e1b7a
Change-Id: Iffb2389f8ef3dcca139a99a617c2079910f3c902
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
PATH_TO_FRAMEWORK_RES=$(gettop)/prebuilts/sdk/current/android.jar
|
||||
PATH_TO_FRAMEWORK_RES=$(gettop)/prebuilts/sdk/current/public/android.jar
|
||||
|
||||
aapt package -M AndroidManifest.xml -S res -I $PATH_TO_FRAMEWORK_RES -F appaslib.apk -f
|
||||
aapt package -M AndroidManifest.xml -S res -I $PATH_TO_FRAMEWORK_RES -F appaslib_lib.apk -f --shared-lib
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/android.jar
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/public/android.jar
|
||||
|
||||
aapt2 compile --dir res -o compiled.flata
|
||||
aapt2 link \
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/android.jar
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/public/android.jar
|
||||
|
||||
aapt2 compile --dir res -o compiled.flata
|
||||
aapt2 link -o feature.apk \
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/android.jar
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/public/android.jar
|
||||
PATH_TO_LIB_ONE=../lib_one/lib_one.apk
|
||||
PATH_TO_LIB_TWO=../lib_two/lib_two.apk
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/android.jar
|
||||
PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/public/android.jar
|
||||
|
||||
aapt2 compile --dir res -o compiled.flata
|
||||
aapt2 link --manifest AndroidManifest.xml -I $PATH_TO_FRAMEWORK_RES -o sparse.apk --enable-sparse-encoding compiled.flata
|
||||
|
||||
Reference in New Issue
Block a user