Revert "Unbundled RS compatibility library support"
This reverts commit 86e4bd059d32d4689c90dc49dd122203a458b56f
Change-Id: Ia52aeedf71d5f77551b54a6bbc46e08012045984
diff --git a/renderscript/Android.mk b/renderscript/Android.mk
deleted file mode 100644
index 2bc9c5d..0000000
--- a/renderscript/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2013 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-ifneq (,$(TARGET_BUILD_APPS))
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := librsjni
-LOCAL_SRC_FILES := lib/$(LOCAL_MODULE).so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libRSSupport
-LOCAL_SRC_FILES := lib/$(LOCAL_MODULE).so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.support.v8.renderscript
-LOCAL_SRC_FILES := lib/javalib.jar
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-#LOCAL_MODULE_SUFFIX := .jar
-
-include $(BUILD_PREBUILT)
-
-##################################
-
-endif # TARGET_BUILD_APPS
diff --git a/renderscript/lib/javalib.jar b/renderscript/lib/javalib.jar
deleted file mode 100644
index 73bfb75..0000000
--- a/renderscript/lib/javalib.jar
+++ /dev/null
Binary files differ
diff --git a/renderscript/lib/libRSSupport.so b/renderscript/lib/libRSSupport.so
deleted file mode 100755
index c03c83c..0000000
--- a/renderscript/lib/libRSSupport.so
+++ /dev/null
Binary files differ
diff --git a/renderscript/lib/libclcore.bc b/renderscript/lib/libclcore.bc
deleted file mode 100644
index 153c486..0000000
--- a/renderscript/lib/libclcore.bc
+++ /dev/null
Binary files differ
diff --git a/renderscript/lib/libcompiler-rt.a b/renderscript/lib/libcompiler-rt.a
deleted file mode 100644
index 4824c70..0000000
--- a/renderscript/lib/libcompiler-rt.a
+++ /dev/null
Binary files differ
diff --git a/renderscript/lib/librsjni.so b/renderscript/lib/librsjni.so
deleted file mode 100755
index 10e738f..0000000
--- a/renderscript/lib/librsjni.so
+++ /dev/null
Binary files differ
diff --git a/tools/Android.mk b/tools/Android.mk
index c8e47f3..6d47b3d 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -63,44 +63,6 @@
##################################
include $(CLEAR_VARS)
-LOCAL_MODULE := bcc_compat
-LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE)$(HOST_EXECUTABLE_SUFFIX)
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := libbcc libbcinfo
-LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(HOST_EXECUTABLE_SUFFIX)
-LOCAL_IS_HOST_MODULE := true
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libbcc
-LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE).so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_IS_HOST_MODULE := true
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libbcinfo
-LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE).so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_IS_HOST_MODULE := true
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
LOCAL_MODULE := llvm-rs-cc
LOCAL_SRC_FILES := $(HOST_OS)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
LOCAL_MODULE_CLASS := EXECUTABLES
diff --git a/tools/linux/bcc_compat b/tools/linux/bcc_compat
deleted file mode 100755
index c782001..0000000
--- a/tools/linux/bcc_compat
+++ /dev/null
Binary files differ
diff --git a/tools/linux/libbcc.so b/tools/linux/libbcc.so
deleted file mode 100755
index be5b76a..0000000
--- a/tools/linux/libbcc.so
+++ /dev/null
Binary files differ
diff --git a/tools/linux/libbcinfo.so b/tools/linux/libbcinfo.so
deleted file mode 100755
index 460b2be..0000000
--- a/tools/linux/libbcinfo.so
+++ /dev/null
Binary files differ
diff --git a/tools/linux/llvm-rs-cc b/tools/linux/llvm-rs-cc
index b8e4cd1..c8bef23 100755
--- a/tools/linux/llvm-rs-cc
+++ b/tools/linux/llvm-rs-cc
Binary files differ
