Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e98e1b authored May 02, 2018 by Anton Hansson Committed by android-build-merger May 02, 2018

Merge "frameworks/base: Update a few more references to android.jar."

am: 85e68063

Change-Id: I6338218432a1e9d3f99b392f6736fa6452809b82

parents 4d213e58 85e68063

libs/androidfw/tests/data/appaslib/build

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

libs/androidfw/tests/data/basic/build

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

		aapt package \
		-M AndroidManifest.xml \

libs/androidfw/tests/data/feature/build

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 \

libs/androidfw/tests/data/libclient/build

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

libs/androidfw/tests/data/sparse/build

+1 −1

Original line number	Diff line number	Diff line
		@@ -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