Snap for 11400057 from 466d4c37f03e7e656262c7f4981678c46d4b899a to simpleperf-releasesimpleperf-release

Change-Id: Idc9341e29f694e6a035b04f9509c2ef0aa93d243

1 files changed, 16 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index e3b272b5..d217adc2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -454,36 +454,35 @@ cc_library_static {
     ],
 }
 
-// Add header file targets.
-genrule {
-    name: "tflite_support_metadata_schema",
-    srcs: ["tensorflow_lite_support/metadata/metadata_schema.fbs"],
-    out: ["tensorflow_lite_support/metadata/metadata_schema_generated.h"],
-    defaults: ["tflite_support_fbgen"],
-}
-
 // -----------------
 // Generate headers with FlatBuffer schema compiler.
 // -----------------
-genrule_defaults {
-    name: "tflite_support_fbgen",
+
+FLATC_ARGS = "$(location flatc) --cpp --no-union-value-namespacing --gen-object-api --keep-prefix -I external/tflite-support -o $$(dirname $(out)) "
+
+genrule {
+    name: "tflite_support_metadata_schema",
     tools: ["flatc"],
-    // "depfile" is used here in conjunction with flatc's -M to gather the deps
-    cmd: "$(location flatc) --cpp --no-union-value-namespacing --gen-object-api --keep-prefix -I external/tflite-support -M $(in) >$(depfile) && " +
-        "$(location flatc) --cpp --no-union-value-namespacing --gen-object-api --keep-prefix -I external/tflite-support -o $$(dirname $(out)) $(in)",
-    depfile: true,
+    srcs: ["tensorflow_lite_support/metadata/metadata_schema.fbs"],
+    cmd: FLATC_ARGS + " $(in)",
+    out: ["tensorflow_lite_support/metadata/metadata_schema_generated.h"],
 }
 
 genrule {
     name: "tflite_support_spm_config",
+    tools: ["flatc"],
     srcs: ["tensorflow_lite_support/custom_ops/kernel/sentencepiece/config.fbs"],
+    cmd: FLATC_ARGS + " $(in)",
     out: ["tensorflow_lite_support/custom_ops/kernel/sentencepiece/config_generated.h"],
-    defaults: ["tflite_support_fbgen"],
 }
 
 genrule {
     name: "tflite_support_spm_encoder_config",
-    srcs: ["tensorflow_lite_support/custom_ops/kernel/sentencepiece/encoder_config.fbs"],
+    tools: ["flatc"],
+    srcs: [
+        "tensorflow_lite_support/custom_ops/kernel/sentencepiece/config.fbs",
+        "tensorflow_lite_support/custom_ops/kernel/sentencepiece/encoder_config.fbs",
+    ],
+    cmd: FLATC_ARGS + " $(location tensorflow_lite_support/custom_ops/kernel/sentencepiece/encoder_config.fbs)",
     out: ["tensorflow_lite_support/custom_ops/kernel/sentencepiece/encoder_config_generated.h"],
-    defaults: ["tflite_support_fbgen"],
 }