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

Commit d43b676f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Shared library support"

parents ab7bc7af ceb9b2f8

tests/SharedLibrary/client/Android.mk

+1 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

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



LOCAL_RES_LIBRARIES := SharedLibrary

tests/SharedLibrary/lib/Android.mk

+1 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true



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

tests/SharedLibrary/lib/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 


    <public type="drawable" name="size_48x48" id="0x00030000" />



    <public type="array" name="animals"     id="0x02050000" />

    <public type="array" name="animals"     id="0x00050000" />

</resources>

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 = "7";

static const char* sMinorVersion = "8";



int PrintVersion() {

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

tools/aapt2/NameMangler.h

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ class NameMangler { 
    return policy_.packages_to_mangle.count(package) != 0;

  }



  const std::string& GetTargetPackageName() const { return policy_.target_package_name; }



  /**

   * Returns a mangled name that is a combination of `name` and `package`.

   * The mangled name should contain symbols that are illegal to define in XML,