summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2015-12-10 19:01:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-12-10 19:01:22 +0000
commit940cfe3277fc0ad452e5554f258697ffaf95b060 (patch)
treeccd6d84c5d4ac7482a4816ddfb4e84681fe0c19f
parent4d4f0db8d9ec5b9130066a54d8374c23b8a7d168 (diff)
parent535fea1e42b16c8b4a681cc0101f79c3662cb8b3 (diff)
Merge "Use Android.mk to specify private symbol package name"
-rw-r--r--core/res/Android.mk1
-rw-r--r--core/res/res/values/symbols.xml4
2 files changed, 1 insertions, 4 deletions
diff --git a/core/res/Android.mk b/core/res/Android.mk
index cfc791df43eb..a1bef8326fb7 100644
--- a/core/res/Android.mk
+++ b/core/res/Android.mk
@@ -23,6 +23,7 @@ LOCAL_CERTIFICATE := platform
# Tell aapt to create "extending (non-application)" resource IDs,
# since these resources will be used by many apps.
LOCAL_AAPT_FLAGS := -x
+LOCAL_AAPT_FLAGS += --private-symbols com.android.internal
LOCAL_MODULE_TAGS := optional
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 7db82d56b874..530b08de8009 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -16,10 +16,6 @@
*/
-->
<resources>
- <!-- We don't want to publish private symbols in android.R as part of the
- SDK. Instead, put them here. -->
- <private-symbols package="com.android.internal" />
-
<!-- Private symbols that we need to reference from framework code. See
frameworks/base/core/res/MakeJavaSymbols.sed for how to easily generate
this.