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

Commit 4551a07a authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Use $(AAPT) instead of aapt for verifying uses libraries" am: 4537ebb7 am: c3bd43bb 

am: 4fab58f0

Change-Id: I49043a329074a9141684f9de2d350f1684951be6
parents c4bb8afa 4fab58f0

core/dex_preopt_libart.mk

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ class_loader_context=$(PRIVATE_DEX2OAT_CLASS_LOADER_CONTEXT) && \ 
stored_class_loader_context_arg="" && \

uses_library_names="$(PRIVATE_USES_LIBRARY_NAMES)" && \

optional_uses_library_names="$(PRIVATE_OPTIONAL_USES_LIBRARY_NAMES)" && \

aapt_binary="$(AAPT)" && \

$(if $(filter true,$(PRIVATE_ENFORCE_USES_LIBRARIES)), \

source build/make/core/verify_uses_libraries.sh "$(1)" && \

source build/make/core/construct_context.sh "$(PRIVATE_CONDITIONAL_USES_LIBRARIES_HOST)" "$(PRIVATE_CONDITIONAL_USES_LIBRARIES_TARGET)" && \

core/verify_uses_libraries.sh

+3 −1
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
# limitations under the License.





# apt_binary is $(AAPT) in the build.



# Parse sdk, targetSdk, and uses librares in the APK, then cross reference against build specified ones.



set -e

local_apk=$1

badging=$(aapt dump badging "${local_apk}")

badging=$(${aapt_binary} dump badging "${local_apk}")

export sdk_version=$(echo "${badging}" | grep "sdkVersion" | sed -n "s/sdkVersion:'\(.*\)'/\1/p")

# Export target_sdk_version to the caller.

export target_sdk_version=$(echo "${badging}" | grep "targetSdkVersion" | sed -n "s/targetSdkVersion:'\(.*\)'/\1/p")