Merge "AAPT support for feature splits" into lmp-dev

Author: Adam Lesinski

include/androidfw/ResourceTypes.h

@@ -1684,6 +1684,8 @@ class ResTable
     public:
         inline virtual ~Accessor() { }
 
+        virtual const String16& getAssetsPackage() const = 0;
+
         virtual uint32_t getCustomResource(const String16& package,
                                            const String16& type,
                                            const String16& name) const = 0;

libs/androidfw/ResourceTypes.cpp

@@ -4630,11 +4630,13 @@ bool ResTable::stringToValue(Res_value* outValue, String16* outString,
                     type.size(), package.string(), package.size(), &specFlags);
             if (rid != 0) {
                 if (enforcePrivate) {
-                    if ((specFlags&ResTable_typeSpec::SPEC_PUBLIC) == 0) {
-                        if (accessor != NULL) {
-                            accessor->reportError(accessorCookie, "Resource is not public.");
+                    if (accessor == NULL || accessor->getAssetsPackage() != package) {
+                        if ((specFlags&ResTable_typeSpec::SPEC_PUBLIC) == 0) {
+                            if (accessor != NULL) {
+                                accessor->reportError(accessorCookie, "Resource is not public.");
+                            }
+                            return false;
                         }
-                        return false;
                     }
                 }
 

libs/androidfw/tests/Idmap_test.cpp

@@ -19,6 +19,7 @@
 #include <utils/String8.h>
 #include <utils/String16.h>
 #include "TestHelpers.h"
+#include "data/R.h"
 
 #include <gtest/gtest.h>
 
@@ -43,16 +44,6 @@ namespace {
 
 enum { MAY_NOT_BE_BAG = false };
 
-static const uint32_t attr_attr1            = 0x7f010000;
-static const uint32_t attr_attr2            = 0x7f010001;
-static const uint32_t string_test1          = 0x7f020000;
-static const uint32_t string_test2          = 0x7f020001;
-static const uint32_t integer_number1       = 0x7f030000;
-static const uint32_t integer_number2       = 0x7f030001;
-static const uint32_t style_Theme1          = 0x7f040000;
-static const uint32_t style_Theme2          = 0x7f040001;
-static const uint32_t array_integerArray1   = 0x7f050000;
-
 class IdmapTest : public ::testing::Test {
 protected:
     virtual void SetUp() {
@@ -79,7 +70,7 @@ TEST_F(IdmapTest, canLoadIdmap) {
 
 TEST_F(IdmapTest, overlayOverridesResourceValue) {
     Res_value val;
-    ssize_t block = mTargetTable.getResource(string_test2, &val, false);
+    ssize_t block = mTargetTable.getResource(R::string::test2, &val, false);
     ASSERT_GE(block, 0);
     ASSERT_EQ(Res_value::TYPE_STRING, val.dataType);
     const ResStringPool* pool = mTargetTable.getTableStringBlock(block);
@@ -93,7 +84,7 @@ TEST_F(IdmapTest, overlayOverridesResourceValue) {
 
     ASSERT_EQ(NO_ERROR, mTargetTable.add(overlay_arsc, overlay_arsc_len, mData, mDataSize));
 
-    ssize_t newBlock = mTargetTable.getResource(string_test2, &val, false);
+    ssize_t newBlock = mTargetTable.getResource(R::string::test2, &val, false);
     ASSERT_GE(newBlock, 0);
     ASSERT_NE(block, newBlock);
     ASSERT_EQ(Res_value::TYPE_STRING, val.dataType);
@@ -110,7 +101,7 @@ TEST_F(IdmapTest, overlaidResourceHasSameName) {
     ASSERT_EQ(NO_ERROR, mTargetTable.add(overlay_arsc, overlay_arsc_len, mData, mDataSize));
 
     ResTable::resource_name resName;
-    ASSERT_TRUE(mTargetTable.getResourceName(array_integerArray1, false, &resName));
+    ASSERT_TRUE(mTargetTable.getResourceName(R::array::integerArray1, false, &resName));
 
     ASSERT_TRUE(resName.package != NULL);
     ASSERT_TRUE(resName.type != NULL);

libs/androidfw/tests/ResTable_test.cpp

@@ -19,6 +19,7 @@
 #include <utils/String8.h>
 #include <utils/String16.h>
 #include "TestHelpers.h"
+#include "data/R.h"
 
 #include <gtest/gtest.h>
 
@@ -35,16 +36,6 @@ namespace {
 
 enum { MAY_NOT_BE_BAG = false };
 
-static const uint32_t attr_attr1            = 0x7f010000;
-static const uint32_t attr_attr2            = 0x7f010001;
-static const uint32_t string_test1          = 0x7f020000;
-static const uint32_t string_test2          = 0x7f020001;
-static const uint32_t integer_number1       = 0x7f030000;
-static const uint32_t integer_number2       = 0x7f030001;
-static const uint32_t style_Theme1          = 0x7f040000;
-static const uint32_t style_Theme2          = 0x7f040001;
-static const uint32_t array_integerArray1   = 0x7f050000;
-
 TEST(ResTableTest, shouldLoadSuccessfully) {
     ResTable table;
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
@@ -55,7 +46,7 @@ TEST(ResTableTest, simpleTypeIsRetrievedCorrectly) {
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
 
     Res_value val;
-    ssize_t block = table.getResource(string_test1, &val, MAY_NOT_BE_BAG);
+    ssize_t block = table.getResource(R::string::test1, &val, MAY_NOT_BE_BAG);
 
     ASSERT_GE(block, 0);
     ASSERT_EQ(Res_value::TYPE_STRING, val.dataType);
@@ -75,76 +66,76 @@ TEST(ResTableTest, resourceNameIsResolved) {
                                              0, 0,
                                              defPackage.string(), defPackage.size());
     ASSERT_NE(uint32_t(0x00000000), resID);
-    ASSERT_EQ(string_test1, resID);
+    ASSERT_EQ(R::string::test1, resID);
 }
 
 TEST(ResTableTest, noParentThemeIsAppliedCorrectly) {
     ResTable table;
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
 
     ResTable::Theme theme(table);
-    ASSERT_EQ(NO_ERROR, theme.applyStyle(style_Theme1));
+    ASSERT_EQ(NO_ERROR, theme.applyStyle(R::style::Theme1));
 
     Res_value val;
     uint32_t specFlags = 0;
-    ssize_t index = theme.getAttribute(attr_attr1, &val, &specFlags);
+    ssize_t index = theme.getAttribute(R::attr::attr1, &val, &specFlags);
     ASSERT_GE(index, 0);
     ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
     ASSERT_EQ(uint32_t(100), val.data);
 
-    index = theme.getAttribute(attr_attr2, &val, &specFlags);
+    index = theme.getAttribute(R::attr::attr2, &val, &specFlags);
     ASSERT_GE(index, 0);
     ASSERT_EQ(Res_value::TYPE_REFERENCE, val.dataType);
-    ASSERT_EQ(integer_number1, val.data);
+    ASSERT_EQ(R::integer::number1, val.data);
 }
 
 TEST(ResTableTest, parentThemeIsAppliedCorrectly) {
     ResTable table;
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
 
     ResTable::Theme theme(table);
-    ASSERT_EQ(NO_ERROR, theme.applyStyle(style_Theme2));
+    ASSERT_EQ(NO_ERROR, theme.applyStyle(R::style::Theme2));
 
     Res_value val;
     uint32_t specFlags = 0;
-    ssize_t index = theme.getAttribute(attr_attr1, &val, &specFlags);
+    ssize_t index = theme.getAttribute(R::attr::attr1, &val, &specFlags);
     ASSERT_GE(index, 0);
     ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
     ASSERT_EQ(uint32_t(300), val.data);
 
-    index = theme.getAttribute(attr_attr2, &val, &specFlags);
+    index = theme.getAttribute(R::attr::attr2, &val, &specFlags);
     ASSERT_GE(index, 0);
     ASSERT_EQ(Res_value::TYPE_REFERENCE, val.dataType);
-    ASSERT_EQ(integer_number1, val.data);
+    ASSERT_EQ(R::integer::number1, val.data);
 }
 
 TEST(ResTableTest, referenceToBagIsNotResolved) {
     ResTable table;
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
 
     Res_value val;
-    ssize_t block = table.getResource(integer_number2, &val, MAY_NOT_BE_BAG);
+    ssize_t block = table.getResource(R::integer::number2, &val, MAY_NOT_BE_BAG);
     ASSERT_GE(block, 0);
     ASSERT_EQ(Res_value::TYPE_REFERENCE, val.dataType);
-    ASSERT_EQ(array_integerArray1, val.data);
+    ASSERT_EQ(R::array::integerArray1, val.data);
 
     ssize_t newBlock = table.resolveReference(&val, block);
     EXPECT_EQ(block, newBlock);
     EXPECT_EQ(Res_value::TYPE_REFERENCE, val.dataType);
-    EXPECT_EQ(array_integerArray1, val.data);
+    EXPECT_EQ(R::array::integerArray1, val.data);
 }
 
 TEST(ResTableTest, resourcesStillAccessibleAfterParameterChange) {
     ResTable table;
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
 
     Res_value val;
-    ssize_t block = table.getResource(integer_number1, &val, MAY_NOT_BE_BAG);
+    ssize_t block = table.getResource(R::integer::number1, &val, MAY_NOT_BE_BAG);
     ASSERT_GE(block, 0);
     ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
 
     const ResTable::bag_entry* entry;
-    ssize_t count = table.lockBag(array_integerArray1, &entry);
+    ssize_t count = table.lockBag(R::array::integerArray1, &entry);
     ASSERT_GE(count, 0);
     table.unlockBag(entry);
 
@@ -153,11 +144,11 @@ TEST(ResTableTest, resourcesStillAccessibleAfterParameterChange) {
     param.density = 320;
     table.setParameters(&param);
 
-    block = table.getResource(integer_number1, &val, MAY_NOT_BE_BAG);
+    block = table.getResource(R::integer::number1, &val, MAY_NOT_BE_BAG);
     ASSERT_GE(block, 0);
     ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
 
-    count = table.lockBag(array_integerArray1, &entry);
+    count = table.lockBag(R::array::integerArray1, &entry);
     ASSERT_GE(count, 0);
     table.unlockBag(entry);
 }
@@ -167,7 +158,7 @@ TEST(ResTableTest, resourceIsOverridenWithBetterConfig) {
     ASSERT_EQ(NO_ERROR, table.add(basic_arsc, basic_arsc_len));
 
     Res_value val;
-    ssize_t block = table.getResource(integer_number1, &val, MAY_NOT_BE_BAG);
+    ssize_t block = table.getResource(R::integer::number1, &val, MAY_NOT_BE_BAG);
     ASSERT_GE(block, 0);
     ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
     ASSERT_EQ(uint32_t(200), val.data);
@@ -180,7 +171,7 @@ TEST(ResTableTest, resourceIsOverridenWithBetterConfig) {
     param.country[1] = 'E';
     table.setParameters(&param);
 
-    block = table.getResource(integer_number1, &val, MAY_NOT_BE_BAG);
+    block = table.getResource(R::integer::number1, &val, MAY_NOT_BE_BAG);
     ASSERT_GE(block, 0);
     ASSERT_EQ(Res_value::TYPE_INT_DEC, val.dataType);
     ASSERT_EQ(uint32_t(400), val.data);