Merge "Add xmlpool/options.h back in the list of intermediate prebuilt source files" am: 5e0303ace0 am: 5b31ffb77e
am: fe9a1ef2ab

Change-Id: I66974b15354d7c13c8049de61d66e7980804fc65
diff --git a/src/util/Android.mk b/src/util/Android.mk
index 4cd8491..b2efde7 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -63,14 +63,14 @@
 	@cp -f $< $@
 
 MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
-LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
+LOCAL_GENERATED_SOURCES := $(MESA_DRI_OPTIONS_H)
 
 $(intermediates)/format_srgb.c: $(prebuilt_intermediates)/util/format_srgb.c
 	@mkdir -p $(dir $@)
 	@cp -f $< $@
 
 MESA_FORMAT_SRGB_C := $(intermediates)/format_srgb.c
-LOCAL_GENERATED_SOURCES := $(MESA_FORMAT_SRGB_C)
+LOCAL_GENERATED_SOURCES += $(MESA_FORMAT_SRGB_C)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)