add tests for parsing constant expressions.
Change-Id: Ic1f524c604fc72b9d1b7b330b608ff38ce287921
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index 3e2794b..2356506 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -9,23 +9,6 @@
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
-# Build IFooCallback.hal
-#
-GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFooCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces\
- android.hardware.tests.foo@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
-
-$(GEN): $(LOCAL_PATH)/IFooCallback.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
# Build types.hal
#
GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
@@ -43,6 +26,23 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build IFooCallback.hal
+#
+GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFooCallback.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces\
+ android.hardware.tests.foo@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+
+$(GEN): $(LOCAL_PATH)/IFooCallback.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build IFoo.hal
#
GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp