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

Commit f34b6f4f authored by Adam Lesinski's avatar Adam Lesinski
Browse files

AAPT2: Add --package-id flag for feature-split suppport 

Bug: 35928935
Change-Id: Ia8496505e61cfcfdb8f9f62366d2f36e453db111
Test: make aapt2_tests
parent df2870df

tests/FeatureSplit/base/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := FeatureSplitBase

LOCAL_EXPORT_PACKAGE_RESOURCES := true



LOCAL_MODULE_TAGS := tests

tests/FeatureSplit/feature1/Android.mk

+5 −7
Original line number Diff line number Diff line
@@ -17,17 +17,15 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := FeatureSplit1

LOCAL_MODULE_TAGS := tests



featureOf := FeatureSplitBase

LOCAL_APK_LIBRARIES := FeatureSplitBase

LOCAL_RES_LIBRARIES := FeatureSplitBase



LOCAL_APK_LIBRARIES := $(featureOf)

featureOfApk := $(call intermediates-dir-for,APPS,$(featureOf))/package.apk

localRStamp := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON)/src/R.stamp

$(localRStamp): $(featureOfApk)



LOCAL_AAPT_FLAGS := --feature-of $(featureOfApk) --custom-package com.android.test.split.feature.one

LOCAL_AAPT_FLAGS += --package-id 0x80

LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.one



include $(BUILD_PACKAGE)

tests/FeatureSplit/feature2/Android.mk

+4 −11
Original line number Diff line number Diff line
@@ -17,22 +17,15 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := FeatureSplit2

LOCAL_MODULE_TAGS := tests



featureOf := FeatureSplitBase

featureAfter := FeatureSplit1

LOCAL_APK_LIBRARIES := FeatureSplitBase

LOCAL_RES_LIBRARIES := FeatureSplitBase



LOCAL_APK_LIBRARIES := $(featureOf)



featureOfApk := $(call intermediates-dir-for,APPS,$(featureOf))/package.apk

featureAfterApk := $(call intermediates-dir-for,APPS,$(featureAfter))/package.apk

localRStamp := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON)/src/R.stamp

$(localRStamp): $(featureOfApk) $(featureAfterApk)



LOCAL_AAPT_FLAGS := --feature-of $(featureOfApk)

LOCAL_AAPT_FLAGS += --feature-after $(featureAfterApk)

LOCAL_AAPT_FLAGS += --package-id 0x81

LOCAL_AAPT_FLAGS += --custom-package com.android.test.split.feature.two



include $(BUILD_PACKAGE)

tools/aapt2/Main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace aapt { 
static const char* sMajorVersion = "2";



// Update minor version whenever a feature or flag is added.

static const char* sMinorVersion = "9";

static const char* sMinorVersion = "10";



int PrintVersion() {

  std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "."

tools/aapt2/diff/Diff.cpp

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ class ZeroingReferenceVisitor : public ValueVisitor { 


  void Visit(Reference* ref) override {

    if (ref->name && ref->id) {

      if (ref->id.value().package_id() == 0x7f) {

      if (ref->id.value().package_id() == kAppPackageId) {

        ref->id = {};

      }

    }