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

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

Merge "AAPT2: optionally keep resources without default value"

parents ee3fa7ed d8d29010

core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ LOCAL_PACKAGE_NAME := OverlayDeviceTests_AppOverlayOne 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ LOCAL_PACKAGE_NAME := OverlayDeviceTests_AppOverlayTwo 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ LOCAL_PACKAGE_NAME := OverlayDeviceTests_FrameworkOverlay 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ LOCAL_PACKAGE_NAME := OverlayHostTests_UpdateOverlay 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)



my_package_prefix := com.android.server.om.hosttest.framework_overlay

tools/aapt2/cmd/Link.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1776,11 +1776,13 @@ class Linker { 


    // Before we process anything, remove the resources whose default values don't exist.

    // We want to force any references to these to fail the build.

    if (!options_.no_resource_removal) {

      if (!NoDefaultResourceRemover{}.Consume(context_, &final_table_)) {

        context_->GetDiagnostics()->Error(DiagMessage()

                                          << "failed removing resources with no defaults");

        return 1;

      }

    }



    ReferenceLinker linker;

    if (!linker.Consume(context_, &final_table_)) {