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

Commit 8acd3883 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Use AAPT2 to build framework resources"

parents 5fa4754c ab0691e7

core/res/Android.mk

+6 −12
Original line number Diff line number Diff line
@@ -16,16 +16,18 @@ 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_PACKAGE_NAME := framework-res

LOCAL_CERTIFICATE := platform

LOCAL_MODULE_TAGS := optional



# Tell aapt to create "extending (non-application)" resource IDs,

# since these resources will be used by many apps.

LOCAL_AAPT_FLAGS := -x

# Generate private symbols into the com.android.internal.R class

# so they are not accessible to 3rd party apps.

LOCAL_AAPT_FLAGS += --private-symbols com.android.internal



LOCAL_MODULE_TAGS := optional

# Framework doesn't need versioning since it IS the platform.

LOCAL_AAPT_FLAGS += --no-auto-version



# Install this alongside the libraries.

LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)
@@ -34,12 +36,4 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES) 
# PRODUCT-agnostic resource data like IDs and type definitions.

LOCAL_EXPORT_PACKAGE_RESOURCES := true



# Include resources generated by system RenderScript files.

framework_GENERATED_SOURCE_DIR := $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)/src

framework_RenderScript_STAMP_FILE := $(framework_GENERATED_SOURCE_DIR)/RenderScript.stamp

#LOCAL_RESOURCE_DIR := $(framework_GENERATED_SOURCE_DIR)/renderscript/res $(LOCAL_PATH)/res



include $(BUILD_PACKAGE)
 


# Make sure the system .rs files get compiled before building the package-export.apk.

# $(resource_export_package): $(framework_RenderScript_STAMP_FILE)

core/res/res/values/public.xml

+21 −0
Original line number Diff line number Diff line
@@ -2742,4 +2742,25 @@ 
    <public type="attr" name="showMetadataInPreview" id="0x0101052f" />

    <public type="attr" name="colorSecondary" id="0x01010530" />



  <!-- ===============================================================

       Resources added in version O of the platform



       NOTE: add <public> elements within a <public-group> like so:



       <public-group type="attr" first-id="0x01010531">

           <public name="exampleAttr1" />

           <public name="exampleAttr2" />

       </public-group>

       =============================================================== -->

    <eat-comment />



    <public-group type="attr" first-id="0x01010531">

    </public-group>



    <public-group type="style" first-id="0x010302e0">

    </public-group>



    <public-group type="id" first-id="0x01020041">

    </public-group>



</resources>