Bug 1352855 - Follow-up to fix bustage; r=me
authorJim Chen <nchen@mozilla.com>
Sun, 09 Apr 2017 00:48:15 -0400
changeset 559358 c536c2decd20bf8039c0cda7229146f082561b96
parent 559357 7ca9491181bd1baac40447584a08d2fab075dd46
child 559359 bf3ed77b00c1d78b23f014776fd76cb3fc11756b
push id53058
push userarchaeopteryx@coole-files.de
push dateSun, 09 Apr 2017 21:36:26 +0000
reviewersme
bugs1352855
milestone55.0a1
Bug 1352855 - Follow-up to fix bustage; r=me
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -576,24 +576,24 @@ GECKOVIEW_AIDLS = \
   org/mozilla/gecko/media/IMediaDrmBridgeCallbacks.aidl \
   org/mozilla/gecko/media/IMediaManager.aidl \
   org/mozilla/gecko/process/IChildProcess.aidl \
   org/mozilla/gecko/process/IProcessManager.aidl \
   $(NULL)
 
 geckoview_aidl_src_path := $(topsrcdir)/mobile/android/geckoview/src/main/aidl
 geckoview_aidl_target_path := generated
-geckoview_aidl_targets := $(addprefix $(geckoview_aidl_target_path)/,$($(GECKOVIEW_AIDLS:.java=):.aidl=.java))
+geckoview_aidl_targets := $(addprefix $(geckoview_aidl_target_path)/,$(patsubst %.aidl,%.java,$(GECKOVIEW_AIDLS:.java=)))
 
 $(geckoview_aidl_targets): $(geckoview_aidl_target_path)/%.java: $(geckoview_aidl_src_path)/%.aidl
 	@echo "Processing AIDL: $< => $@"
 	$(AIDL) -p$(ANDROID_SDK)/framework.aidl -I$(geckoview_aidl_src_path) -o$(geckoview_aidl_target_path) $<
 
 FENNEC_AIDLS = \
   $(NULL)
 
 fennec_aidl_src_path := $(srcdir)/aidl
 fennec_aidl_target_path := generated
-fennec_aidl_targets := $(addprefix $(fennec_aidl_target_path)/,$($(FENNEC_AIDLS:.java=):.aidl=.java))
+fennec_aidl_targets := $(addprefix $(fennec_aidl_target_path)/,$(patsubst %.aidl,%.java,$(FENNEC_AIDLS:.java=)))
 
 $(fennec_aidl_targets): $(fennec_aidl_target_path)/%.java: $(fennec_aidl_src_path)/%.aidl
 	@echo "Processing AIDL: $< => $@"
 	$(AIDL) -p$(ANDROID_SDK)/framework.aidl -I$(fennec_aidl_src_path) -I$(geckoview_aidl_src_path) -o$(fennec_aidl_target_path) $<