From e108bc15e6077f7b5449ccf3fe917932892308ec Mon Sep 17 00:00:00 2001
From: Xusong Wang <xusongw@google.com>
Date: Thu, 11 Jul 2019 09:07:49 -0700
Subject: [PATCH] Remove compiler flag for dynamic output shape tests.

Having separate VTS models and tests for difference HAL version. This
compiler flag is no longer needed.

Bug: 122740334
Test: All VTS 1.x and 1.xCompat1.y
Change-Id: Idbd96a954da9bd5a0e0e66afd9120d84a1efc784
Merged-In: Idbd96a954da9bd5a0e0e66afd9120d84a1efc784
(cherry picked from commit 7763d5354524d625e3d2b81f17e8e6194e7adc16)
---
 neuralnetworks/1.2/vts/functional/Android.bp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp
index b48646f6e2..31b853242c 100644
--- a/neuralnetworks/1.2/vts/functional/Android.bp
+++ b/neuralnetworks/1.2/vts/functional/Android.bp
@@ -56,9 +56,6 @@ cc_test {
         "GeneratedTestsV1_0.cpp",
         "ValidateBurst.cpp",
     ],
-    cflags: [
-        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
-    ],
 }
 
 // Tests for V1_1 models using the V1_2 HAL.
@@ -69,9 +66,6 @@ cc_test {
         "GeneratedTestsV1_1.cpp",
         "ValidateBurst.cpp",
     ],
-    cflags: [
-        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
-    ],
 }
 
 // Tests for V1_2 models.
@@ -84,9 +78,6 @@ cc_test {
         "GeneratedTestsV1_2.cpp",
         "ValidateBurst.cpp",
     ],
-    cflags: [
-        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
-    ],
 }
 
 cc_test {
@@ -98,7 +89,6 @@ cc_test {
         "ValidateBurst.cpp",
     ],
     cflags: [
-        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE",
         "-DPRESUBMIT_NOT_VTS",
     ],
 }