diff --git a/tests/camera2/Android.mk b/tests/camera2/Android.mk
index 6b6a6c4..2ce0b24 100644
--- a/tests/camera2/Android.mk
+++ b/tests/camera2/Android.mk
@@ -36,7 +36,7 @@
 	frameworks/av/services/camera/libcameraservice \
 	frameworks/native/include \
 
-LOCAL_CFLAGS += -Wall -Wextra
+LOCAL_CFLAGS += -Wall -Wextra -include FutureMetadata.h
 
 LOCAL_MODULE:= camera2_test
 LOCAL_MODULE_TAGS := tests
diff --git a/tests/camera2/FutureMetadata.h b/tests/camera2/FutureMetadata.h
new file mode 100644
index 0000000..58ea698
--- /dev/null
+++ b/tests/camera2/FutureMetadata.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Rename select master metadata 2.0 symbols to metadata symbols in jb-mr1-dev
+ * - this avoids having to bring in cross-repo changes
+ */
+
+#ifndef __ANDROID_HAL_CAMERA2_TESTS_FUTURE_METADATA__
+#define __ANDROID_HAL_CAMERA2_TESTS_FUTURE_METADATA__
+
+#define ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE ANDROID_SENSOR_EXPOSURE_TIME_RANGE
+#define ANDROID_CONTROL_MODE_OFF ANDROID_CONTROL_OFF
+
+#endif