Cleanup: Remove build variables that are empty now
There is still a "android_util" blaze target where the name now seems to be misleading (just removing it breaks the dependencies).
@@ -2273,10 +2273,6 @@ JAVA_PUBLIC_SOURCES_OTHER = \
JAVA_PRIVATE_SOURCES_OTHER = \
java/lang/management/ThreadInfo.java
-ANDROID_PUBLIC_SOURCES =
-
-ANDROID_PRIVATE_SOURCES =
-
JSON_PUBLIC_SOURCES = \
org/json/JSONArray.java \
org/json/JSONException.java \
@@ -2307,7 +2303,7 @@ JAVA_SOURCES_SQL = $(JAVA_PUBLIC_SOURCES_SQL) $(JAVA_PRIVATE_SOURCES_SQL)
JAVA_SOURCES_BEANS = $(JAVA_PUBLIC_SOURCES_BEANS) $(JAVA_PRIVATE_SOURCES_BEANS)
JAVA_SOURCES_TIME = $(JAVA_PUBLIC_SOURCES_TIME) $(JAVA_PRIVATE_SOURCES_TIME)
JAVA_SOURCES_ICU = $(JAVA_PUBLIC_SOURCES_ICU) $(JAVA_PRIVATE_SOURCES_ICU)
-JAVA_SOURCES_ANDROID = $(ANDROID_PUBLIC_SOURCES) $(ANDROID_PRIVATE_SOURCES)
+JAVA_SOURCES_ANDROID =
JAVA_SOURCES_JSON = $(JSON_PUBLIC_SOURCES) $(JSON_PRIVATE_SOURCES)
# These annotations have a SOURCE retention, and so should not be part of the runtime.
@@ -2521,10 +2517,9 @@ JAVA_PRIVATE_SOURCES = \
$(JAVA_PRIVATE_SOURCES_BEANS) \
$(JAVA_PRIVATE_SOURCES_TIME) \
$(JAVA_PRIVATE_SOURCES_ICU) \
- $(JAVA_PRIVATE_SOURCES_OTHER) \
- $(ANDROID_PRIVATE_SOURCES)
+ $(JAVA_PRIVATE_SOURCES_OTHER)
-JAVA_PUBLIC_SOURCES = $(JAVA_PUBLIC_SOURCES_JRE) $(ANDROID_PUBLIC_SOURCES) \
+JAVA_PUBLIC_SOURCES = $(JAVA_PUBLIC_SOURCES_JRE) \
$(JAVA_PUBLIC_SOURCES_XMLPULL)
JAVA_SOURCES = $(JAVA_PUBLIC_SOURCES) $(JAVA_PRIVATE_SOURCES)
