From 9496c78f681baf26f52fd4540f881c681c366d0c Mon Sep 17 00:00:00 2001
From: James Willcox <snorp@snorp.net>
Date: Wed, 26 Nov 2014 15:16:08 -0600
Subject: [PATCH] Bug 1099345 - Add more descriptive debugging output to the
 Android SDK code generator r=nalexander

--HG--
extra : rebase_source : 47d675ebe19db1a488498a19834674fe2fd8dc4f
---
 build/annotationProcessors/SDKProcessor.java | 16 +++++-----------
 widget/android/bindings/Makefile.in          |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/build/annotationProcessors/SDKProcessor.java b/build/annotationProcessors/SDKProcessor.java
index 10393ff58fd9..2011ebec68db 100644
--- a/build/annotationProcessors/SDKProcessor.java
+++ b/build/annotationProcessors/SDKProcessor.java
@@ -43,7 +43,7 @@ public class SDKProcessor {
     private static ApiLookup sApiLookup;
     private static int sMaxSdkVersion;
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         // We expect a list of jars on the commandline. If missing, whinge about it.
         if (args.length < 5) {
             System.err.println("Usage: java SDKProcessor sdkjar classlistfile outdir fileprefix max-sdk-version");
@@ -106,16 +106,10 @@ public class SDKProcessor {
             String className = i.next();
             System.out.println("Looking up: " + className);
 
-            try {
-                Class<?> c = Class.forName(className, true, loader);
-
-                generateClass(Class.forName(className, true, loader),
-                              stubInitializer,
-                              implementationFile,
-                              headerFile);
-            } catch (Exception e) {
-                System.out.println("Failed to generate class " + className + ": " + e);
-            }
+            generateClass(Class.forName(className, true, loader),
+                          stubInitializer,
+                          implementationFile,
+                          headerFile);
         }
 
         implementationFile.append('\n');
diff --git a/widget/android/bindings/Makefile.in b/widget/android/bindings/Makefile.in
index e285f45a23d5..348f847299a0 100644
--- a/widget/android/bindings/Makefile.in
+++ b/widget/android/bindings/Makefile.in
@@ -15,7 +15,7 @@ sdk_processor := \
 # MediaCodec-classes.txt.  This formulation invokes the SDK processor
 # at most once.
 
-%.cpp %.h: $(ANDROID_SDK)/android.jar %-classes.txt
+%.cpp %.h: $(ANDROID_SDK)/android.jar %-classes.txt FORCE
 	$(sdk_processor) $(ANDROID_SDK)/android.jar $(srcdir)/$*-classes.txt $(CURDIR) $* 16
 
 # We'd like these to be defined in a future GENERATED_EXPORTS list.