Revert "embed .rsh in llvm-rs-cc".
diff --git a/Android.mk b/Android.mk
index 8cc4161..aca6d42 100644
--- a/Android.mk
+++ b/Android.mk
@@ -131,62 +131,6 @@
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_HOST_EXECUTABLE)
-# Host static library containing rs_types.rsh
-# ========================================================
-include $(CLEAR_VARS)
-
-input_data_file := frameworks/base/libs/rs/scriptc/rs_types.rsh
-slangdata_output_var_name := rs_types_header
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := librsheader-types
-LOCAL_MODULE_TAGS := optional
-
-include $(LOCAL_PATH)/SlangData.mk
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# Host static library containing rs_cl.rsh
-# ========================================================
-include $(CLEAR_VARS)
-
-input_data_file := frameworks/base/libs/rs/scriptc/rs_cl.rsh
-slangdata_output_var_name := rs_cl_header
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := librsheader-cl
-LOCAL_MODULE_TAGS := optional
-
-include $(LOCAL_PATH)/SlangData.mk
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# Host static library containing rs_cores.rsh
-# ========================================================
-include $(CLEAR_VARS)
-
-input_data_file := frameworks/base/libs/rs/scriptc/rs_core.rsh
-slangdata_output_var_name := rs_core_header
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := librsheader-core
-LOCAL_MODULE_TAGS := optional
-
-include $(LOCAL_PATH)/SlangData.mk
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# Host static library containing rs_math.rsh
-# ========================================================
-include $(CLEAR_VARS)
-
-input_data_file := frameworks/base/libs/rs/scriptc/rs_math.rsh
-slangdata_output_var_name := rs_math_header
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := librsheader-math
-LOCAL_MODULE_TAGS := optional
-
-include $(LOCAL_PATH)/SlangData.mk
-include $(BUILD_HOST_STATIC_LIBRARY)
-
# Executable llvm-rs-cc for host
# ========================================================
include $(CLEAR_VARS)
@@ -229,11 +173,7 @@
libslang
LOCAL_STATIC_LIBRARIES := \
- libclangDriver \
- librsheader-types \
- librsheader-cl \
- librsheader-core \
- librsheader-math
+ libclangDriver
# For build RSCCOptions.inc from RSCCOptions.td
intermediates := $(call local-intermediates-dir)
diff --git a/slang_backend.h b/slang_backend.h
index 7135ffd..ddcc151 100644
--- a/slang_backend.h
+++ b/slang_backend.h
@@ -81,7 +81,7 @@
const PragmaList &mPragmas;
- // This handler will be invoked before Clang translate @Ctx to LLVM IR. This
+ // This handler will be invoked before Clang translates @Ctx to LLVM IR. This
// give you an opportunity to modified the IR in AST level (scope information,
// unoptimized IR, etc.). After the return from this method, slang will start
// translate @Ctx into LLVM IR. One should not operate on @Ctx afterwards
diff --git a/slang_rs.cpp b/slang_rs.cpp
index 0e03aa7..b723754 100644
--- a/slang_rs.cpp
+++ b/slang_rs.cpp
@@ -34,13 +34,8 @@
RS_HEADER_ENTRY(rs_types) \
RS_HEADER_ENTRY(rs_cl) \
RS_HEADER_ENTRY(rs_core) \
- RS_HEADER_ENTRY(rs_math)
-
-#define RS_HEADER_ENTRY(x) \
- extern const char x ## _header[]; \
- extern unsigned x ## _header_size;
-ENUM_RS_HEADER()
-#undef RS_HEADER_ENTRY
+ RS_HEADER_ENTRY(rs_math) \
+ RS_HEADER_ENTRY(rs_graphics)
bool SlangRS::reflectToJava(const std::string &OutputPathBase,
const std::string &OutputPackageName,
@@ -179,8 +174,7 @@
std::string RSH;
#define RS_HEADER_ENTRY(x) \
- RSH.append("#line 1 \"" #x "."RS_HEADER_SUFFIX"\"\n"); \
- RSH.append(x ## _header, x ## _header_size);
+ RSH.append("#include \"" #x "."RS_HEADER_SUFFIX "\"\n");
ENUM_RS_HEADER()
#undef RS_HEADER_ENTRY
PP.setPredefines(RSH);
@@ -216,9 +210,6 @@
return true;
ENUM_RS_HEADER()
#undef RS_HEADER_ENTRY
- // Deal with rs_graphics.rsh special case
- if (::strcmp(File, "rs_graphics."RS_HEADER_SUFFIX) == 0)
- return true;
return false;
}