aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-12-20 13:03:42 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-12-20 13:03:42 -0800
commitd5f2b54073b1165f91e6212f6c0af2d86475659f (patch)
treecb7af8c269b59492ca2bc10c4c16991b17944c9e /common
parent346f0a1a97c621f4c0dc3c31ffbfd89c5dca36cc (diff)
parentbe33998c0a03941ae968675128dacace85ac1fd1 (diff)
downloadsdk-d5f2b54073b1165f91e6212f6c0af2d86475659f.zip
sdk-d5f2b54073b1165f91e6212f6c0af2d86475659f.tar.gz
sdk-d5f2b54073b1165f91e6212f6c0af2d86475659f.tar.bz2
Merge "Fix package renaming for Manifest and BuildConfig classes"
Diffstat (limited to 'common')
-rw-r--r--common/src/main/java/com/android/SdkConstants.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/common/src/main/java/com/android/SdkConstants.java b/common/src/main/java/com/android/SdkConstants.java
index 48cecc1..a0fdc39 100644
--- a/common/src/main/java/com/android/SdkConstants.java
+++ b/common/src/main/java/com/android/SdkConstants.java
@@ -914,8 +914,14 @@ public final class SdkConstants {
public static final String FN_COMPILED_RESOURCE_CLASS = FN_RESOURCE_BASE + DOT_CLASS;
/** Resource text filename, i.e. "R.txt" */
public static final String FN_RESOURCE_TEXT = FN_RESOURCE_BASE + DOT_TXT;
+ /** Generated manifest class name */
+ public static final String FN_MANIFEST_BASE = "Manifest"; //$NON-NLS-1$
+ /** Generated BuildConfig class name */
+ public static final String FN_BUILD_CONFIG_BASE = "BuildConfig"; //$NON-NLS-1$
/** Manifest java class filename, i.e. "Manifest.java" */
- public static final String FN_MANIFEST_CLASS = "Manifest.java"; //$NON-NLS-1$
+ public static final String FN_MANIFEST_CLASS = FN_MANIFEST_BASE + DOT_JAVA;
+ /** BuildConfig java class filename, i.e. "BuildConfig.java" */
+ public static final String FN_BUILD_CONFIG = FN_BUILD_CONFIG_BASE + DOT_JAVA;
public static final String DRAWABLE_FOLDER = "drawable"; //$NON-NLS-1$
public static final String DRAWABLE_XHDPI = "drawable-xhdpi"; //$NON-NLS-1$