Remove Lua from the Google3 build.

See internal cl/107087297 for details.

Rename some variables in BUILD/BUILD.public.

BUG=skia:

Review URL: https://codereview.chromium.org/1425013008

BUILD.public

@@ -5,8 +5,8 @@
 
 exports_files(["BUILD.public"])
 
-# Platform-independent SRCS
-SRCS = glob(
+# All platform-independent SRCS.
+BASE_SRCS = glob(
     [
         "include/private/*.h",
         "src/**/*.h",
@@ -54,6 +54,9 @@ SRCS = glob(
         "src/gpu/gl/mesa/*",  # Requires SK_MESA define.
         "src/svg/parser/*",  # Missing SkSVG.h.
 
+        # Conflicting dependencies among Lua versions. See cl/107087297.
+        "src/utils/SkLua*",
+
         # Not used.
         "src/animator/**/*",
         "src/views/**/*",
@@ -64,7 +67,7 @@ SRCS = glob(
 )
 
 # Platform-dependent SRCS for google3-default platform.
-SRCS_UNIX = glob(
+BASE_SRCS_UNIX = glob(
     [
         "src/gpu/gl/GrGLDefaultInterface_native.cpp",
         "src/gpu/gl/glx/**/*.cpp",
@@ -107,7 +110,7 @@ SRCS_UNIX = glob(
 )
 
 # Platform-dependent SRCS for google3-default Android.
-SRCS_ANDROID = glob(
+BASE_SRCS_ANDROID = glob(
     [
         # TODO(benjaminwagner): Figure out how to compile with EGL.
         "src/gpu/gl/GrGLDefaultInterface_none.cpp",
@@ -148,7 +151,7 @@ SRCS_ANDROID = glob(
 )
 
 # Platform-dependent SRCS for google3-default iOS.
-SRCS_IOS = glob(
+BASE_SRCS_IOS = glob(
     [
         "src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp",
         "src/opts/**/*.cpp",
@@ -190,27 +193,27 @@ SRCS_IOS = glob(
     ],
 )
 
-PLATFORM_SRCS = select({
-    CONDITION_ANDROID: SRCS_ANDROID,
-    CONDITION_IOS: SRCS_IOS,
-    "//conditions:default": SRCS_UNIX,
+BASE_SRCS_PLATFORM = select({
+    CONDITION_ANDROID: BASE_SRCS_ANDROID,
+    CONDITION_IOS: BASE_SRCS_IOS,
+    "//conditions:default": BASE_SRCS_UNIX,
 })
 
-SRCS_SSSE3 = glob(
+SSSE3_SRCS = glob(
     [
         "src/opts/*SSSE3*.cpp",
         "src/opts/*ssse3*.cpp",
     ],
 )
 
-SRCS_SSE4 = glob(
+SSE4_SRCS = glob(
     [
         "src/opts/*SSE4*.cpp",
         "src/opts/*sse4*.cpp",
     ],
 )
 
-HDRS = glob(
+BASE_HDRS = glob(
     [
         "include/**/*.h",
     ],
@@ -225,6 +228,22 @@ HDRS = glob(
     ],
 )
 
+# Dependencies.
+BASE_DEPS_UNIX = [
+    ":opts_sse4",
+    ":opts_ssse3",
+]
+
+BASE_DEPS_ANDROID = []
+
+BASE_DEPS_IOS = []
+
+BASE_DEPS = select({
+    CONDITION_ANDROID: BASE_DEPS_ANDROID + BASE_EXTERNAL_DEPS_ANDROID,
+    CONDITION_IOS: BASE_DEPS_IOS + BASE_EXTERNAL_DEPS_IOS,
+    "//conditions:default": BASE_DEPS_UNIX + BASE_EXTERNAL_DEPS_UNIX,
+}) + EXTERNAL_DEPS_ALL
+
 # Includes needed by Skia implementation.  Not public includes.
 INCLUDES = [
     "include/android",
@@ -257,21 +276,7 @@ INCLUDES = [
     "third_party/ktx",
 ]
 
-# Dependencies.
-DEPS_UNIX = [
-    ":opts_sse4",
-    ":opts_ssse3",
-]
-
-DEPS_ANDROID = []
-
-DEPS_IOS = []
-
-DEPS = select({
-    CONDITION_ANDROID: DEPS_ANDROID + EXTERNAL_DEPS_ANDROID,
-    CONDITION_IOS: DEPS_IOS + EXTERNAL_DEPS_IOS,
-    "//conditions:default": DEPS_UNIX + EXTERNAL_DEPS_UNIX,
-}) + EXTERNAL_DEPS_ALL
+## :dm
 
 # Platform-independent SRCS for DM.
 DM_SRCS = glob(
@@ -348,12 +353,9 @@ DM_INCLUDES = [
     "tools/timer",
 ]
 
-COPTS_ANDROID = [
-    "-mfpu=neon",
-]
+COPTS_ANDROID = ["-mfpu=neon"]
 
-COPTS_IOS = [
-]
+COPTS_IOS = []
 
 COPTS_UNIX = [
     "-Wno-implicit-fallthrough",  # Some intentional fallthrough.
@@ -406,7 +408,7 @@ LINKOPTS = select({
 
 cc_library(
     name = "opts_ssse3",
-    srcs = SRCS_SSSE3,
+    srcs = SSSE3_SRCS,
     copts = COPTS + ["-mssse3"],
     defines = DEFINES,
     includes = INCLUDES,
@@ -415,7 +417,7 @@ cc_library(
 
 cc_library(
     name = "opts_sse4",
-    srcs = SRCS_SSE4,
+    srcs = SSE4_SRCS,
     copts = COPTS + ["-msse4"],
     defines = DEFINES,
     includes = INCLUDES,
@@ -424,14 +426,14 @@ cc_library(
 
 cc_library(
     name = "skia",
-    srcs = SRCS + PLATFORM_SRCS,
-    hdrs = HDRS,
+    srcs = BASE_SRCS + BASE_SRCS_PLATFORM,
+    hdrs = BASE_HDRS,
     copts = COPTS,
     defines = DEFINES,
     includes = INCLUDES,
     linkopts = LINKOPTS,
     visibility = [":skia_clients"],
-    deps = DEPS,
+    deps = BASE_DEPS,
     alwayslink = 1,
 )
 

tools/BUILD_simulator.py

@@ -76,12 +76,14 @@ global_names = {
   'exports_files': noop,
   'glob': BUILD_glob,
   'select': select_simulator,
-  'BASE_DIR': "",
-  'CONDITION_ANDROID': "CONDITION_ANDROID",
+  'BASE_DIR': '',
+  'BASE_EXTERNAL_DEPS_ANDROID': [],
+  'BASE_EXTERNAL_DEPS_IOS': [],
+  'BASE_EXTERNAL_DEPS_UNIX': [],
+  'CONDITION_ANDROID': 'CONDITION_ANDROID',
+  'CONDITION_IOS': 'CONDITION_IOS',
   'DM_EXTERNAL_DEPS': [],
   'EXTERNAL_DEPS_ALL': [],
-  'EXTERNAL_DEPS_ANDROID': [],
-  'EXTERNAL_DEPS_UNIX': [],
 }
 local_names = {}
 execfile('BUILD.public', global_names, local_names)