Drawable Renderer (#1570)

BUILD.bazel

@@ -12,54 +12,41 @@ load(
     "MLN_OPENGL_SOURCE",
     "MLN_PRIVATE_GENERATED_STYLE_HEADERS",
     "MLN_PUBLIC_GENERATED_STYLE_HEADERS",
-    "MLN_PRIVATE_GENERATED_STYLE_HEADERS",
-    "MLN_GENERATED_STYLE_SOURCE",
-    "MLN_GENERATED_SHADER_HEADERS",
-    "MLN_CORE_SOURCE",
-    "MLN_CORE_HEADERS",
-    "MLN_OPENGL_SOURCE",
-    "MLN_OPENGL_HEADERS",
-    "MLN_DRAWABLES_SOURCE",
-    "MLN_DRAWABLES_HEADERS",
 )
-load("//bazel:macros.bzl", "appendList")
 
 # Generate code required by the core
-# All generated code is placed in the prefix location __generated__
-# by our generator scripts and genrules
-PREFIXED = {
-    "MLN_PUBLIC_GENERATED_STYLE_HEADERS": appendList(MLN_PUBLIC_GENERATED_STYLE_HEADERS, "__generated__/"),
-    "MLN_PRIVATE_GENERATED_STYLE_HEADERS": appendList(MLN_PRIVATE_GENERATED_STYLE_HEADERS, "__generated__/"),
-    "MLN_GENERATED_STYLE_SOURCE": appendList(MLN_GENERATED_STYLE_SOURCE, "__generated__/"),
-    "MLN_GENERATED_SHADER_HEADERS": appendList(MLN_GENERATED_SHADER_HEADERS, "__generated__/"),
-}
-
 filegroup(
     name = "style_data",
-    srcs = glob(["**/*.ejs"], allow_empty = False)
+    srcs = glob(
+        ["**/*.ejs"],
+        allow_empty = False,
+    ),
 )
 
 genrule(
     name = "generated_style_code",
+    srcs = ["style_data"],
+    outs = MLN_PUBLIC_GENERATED_STYLE_HEADERS +
+           MLN_PRIVATE_GENERATED_STYLE_HEADERS +
+           MLN_GENERATED_STYLE_SOURCE,
     cmd = "node $(execpath scripts/generate-style-code.js) --root $(RULEDIR)",
     tools = ["scripts/generate-style-code.js"],
-    srcs = ["style_data"],
-    outs = PREFIXED["MLN_PUBLIC_GENERATED_STYLE_HEADERS"]
-        + PREFIXED["MLN_PRIVATE_GENERATED_STYLE_HEADERS"]
-        + PREFIXED["MLN_GENERATED_STYLE_SOURCE"],
 )
 
 filegroup(
     name = "shader_data",
-    srcs = ["shaders/manifest.json"] + glob(["shaders/*.glsl"], allow_empty = False)
+    srcs = ["shaders/manifest.json"] + glob(
+        ["shaders/*.glsl"],
+        allow_empty = False,
+    ),
 )
 
 genrule(
     name = "generated_shaders",
+    srcs = ["shader_data"],
+    outs = MLN_GENERATED_SHADER_HEADERS,
     cmd = "node $(execpath shaders/generate_shader_code.js) --root $(RULEDIR)",
     tools = ["shaders/generate_shader_code.js"],
-    srcs = ["shader_data"],
-    outs = PREFIXED["MLN_GENERATED_SHADER_HEADERS"],
 )
 
 # This header only target strips the __generated__ prefix for the compiler
@@ -67,13 +54,12 @@ genrule(
 cc_library(
     name = "mbgl-core-generated-public-artifacts",
     srcs = [],
-    hdrs = PREFIXED["MLN_PUBLIC_GENERATED_STYLE_HEADERS"]
-        + PREFIXED["MLN_GENERATED_SHADER_HEADERS"],
-    strip_include_prefix = "__generated__/include",
+    hdrs = MLN_PUBLIC_GENERATED_STYLE_HEADERS +
+           MLN_GENERATED_SHADER_HEADERS,
     visibility = ["//visibility:public"],
     deps = [
-        ":generated_style_code",
         ":generated_shaders",
+        ":generated_style_code",
     ],
 )
 
@@ -81,8 +67,7 @@ cc_library(
 cc_library(
     name = "mbgl-core-generated-private-artifacts",
     srcs = [],
-    hdrs = PREFIXED["MLN_PRIVATE_GENERATED_STYLE_HEADERS"],
-    strip_include_prefix = "__generated__/src",
+    hdrs = MLN_PRIVATE_GENERATED_STYLE_HEADERS,
     visibility = ["//visibility:private"],
     deps = [
         ":generated_style_code",
@@ -123,7 +108,7 @@ cc_library(
         ],
     }) + select({
         "//:ios": ["GLES_SILENCE_DEPRECATION=1"],
-        "//conditions:default": []
+        "//conditions:default": [],
     }),
     includes = [
         "include",
@@ -134,8 +119,8 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        ":mbgl-core-generated-public-artifacts",
         ":mbgl-core-generated-private-artifacts",
+        ":mbgl-core-generated-public-artifacts",
         "//vendor:boost",
         "//vendor:csscolorparser",
         "//vendor:earcut.hpp",