From 35c7bb36c36cc6bced95f0f11bd4786e90b47f08 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Thu, 27 Sep 2012 12:33:37 -0700 Subject: 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 --- common/src/com/android/SdkConstants.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'common/src') 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$ -- cgit v1.1