diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-27 12:33:37 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-09-27 13:15:11 -0700 |
| commit | 35c7bb36c36cc6bced95f0f11bd4786e90b47f08 (patch) | |
| tree | 2ce416c427e28f7d5a4173c450fc53af95b09ccd /common | |
| parent | a787fef750dc198dd9015a8473619f8b343b5e75 (diff) | |
| download | sdk-35c7bb36c36cc6bced95f0f11bd4786e90b47f08.zip sdk-35c7bb36c36cc6bced95f0f11bd4786e90b47f08.tar.gz sdk-35c7bb36c36cc6bced95f0f11bd4786e90b47f08.tar.bz2 | |
Fix issue with generation of R classes for libraries.
When a clean action happen, the order of compilation of
the project isn't dictated by the dependencies between the
project. It is therefore important to detect changed in R.txt
for each library and recompile the project when that happens.
Also fixed a potential NPE when building libraries!
Change-Id: I6a87e9c3a4984e5aa6401270cf83eaea74044c9f
Diffstat (limited to 'common')
| -rw-r--r-- | common/src/com/android/SdkConstants.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/src/com/android/SdkConstants.java b/common/src/com/android/SdkConstants.java index 833acdc..7cbbf68 100644 --- a/common/src/com/android/SdkConstants.java +++ b/common/src/com/android/SdkConstants.java @@ -897,6 +897,8 @@ public final class SdkConstants { public static final String FN_RESOURCE_CLASS = FN_RESOURCE_BASE + DOT_JAVA; /** Resource class file filename, i.e. "R.class" */ 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; /** Manifest java class filename, i.e. "Manifest.java" */ public static final String FN_MANIFEST_CLASS = "Manifest.java"; //$NON-NLS-1$ |