Move scriptc to script_api/include.
Part 1 of the directory re-organization. We're renaming the "api" directory
to "script_api" directory to distinguish between our control api (java or c++)
and our script api.
We're also moving the scriptc directory under that newly renamed directory,
and change its name to the more appropriate "include".
Test: scriptc/generate.sh
Test: compiled ImageProcessing_jb
Change-Id: I00c3bbf5728b652d1541ebe4123717f6ab639f09
diff --git a/build_rs.py b/build_rs.py
index 41fe142..830d4d6 100755
--- a/build_rs.py
+++ b/build_rs.py
@@ -249,7 +249,7 @@
# Copy RS runtime headers.
headers_dst_base = os.path.join(install_dir, 'platform', 'rs')
- headers_src = android_path('frameworks/rs/scriptc')
+ headers_src = android_path('frameworks/rs/script_api/include')
headers_dst = os.path.join(headers_dst_base, 'scriptc')
install_directory(headers_src, headers_dst)
diff --git a/driver/runtime/build_bc_lib_internal.mk b/driver/runtime/build_bc_lib_internal.mk
index 9d217fc..7162e50 100644
--- a/driver/runtime/build_bc_lib_internal.mk
+++ b/driver/runtime/build_bc_lib_internal.mk
@@ -69,7 +69,7 @@
$(addprefix $(intermediates)/, $(ll_sources)))
$(c_bc_files): PRIVATE_INCLUDES := \
- frameworks/rs/scriptc \
+ frameworks/rs/script_api/include \
external/clang/lib/Headers
$(c_bc_files): PRIVATE_CFLAGS := $(bc_cflags)
diff --git a/java/tests/HealingBrush/Android.mk b/java/tests/HealingBrush/Android.mk
index ed974e8..2953cc9 100644
--- a/java/tests/HealingBrush/Android.mk
+++ b/java/tests/HealingBrush/Android.mk
@@ -32,7 +32,7 @@
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \
$(TOPDIR)external/clang/lib/Headers \
- $(TOPDIR)frameworks/rs/scriptc
+ $(TOPDIR)frameworks/rs/script_api/include
LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
LOCAL_JNI_SHARED_LIBRARIES := librsjni
diff --git a/java/tests/ImageProcessing2/Android.mk b/java/tests/ImageProcessing2/Android.mk
index ad2bc52..67d107e 100644
--- a/java/tests/ImageProcessing2/Android.mk
+++ b/java/tests/ImageProcessing2/Android.mk
@@ -29,7 +29,7 @@
LOCAL_RENDERSCRIPT_TARGET_API := 18
LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := $(TOPDIR)external/clang/lib/Headers \
- $(TOPDIR)frameworks/rs/scriptc
+ $(TOPDIR)frameworks/rs/script_api/include
LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
LOCAL_JNI_SHARED_LIBRARIES := librsjni
diff --git a/java/tests/RSTest_CompatLib/Android.mk b/java/tests/RSTest_CompatLib/Android.mk
index 37e2718..6c52d5b 100644
--- a/java/tests/RSTest_CompatLib/Android.mk
+++ b/java/tests/RSTest_CompatLib/Android.mk
@@ -32,7 +32,7 @@
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \
$(TOPDIR)external/clang/lib/Headers \
- $(TOPDIR)frameworks/rs/scriptc
+ $(TOPDIR)frameworks/rs/script_api/include
LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
LOCAL_JNI_SHARED_LIBRARIES := librsjni
diff --git a/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_single_source_alloc.java b/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_single_source_alloc.java
index 3d265a8..6d0e3ad 100644
--- a/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_single_source_alloc.java
+++ b/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_single_source_alloc.java
@@ -29,7 +29,7 @@
private int dimZ = 5;
private int start = 23;
- // Mimicking enum rs_data_type in frameworks/rs/scriptc/rs_object_types.rsh
+ // Mimicking enum rs_data_type in frameworks/rs/script_api/include/rs_object_types.rsh
private enum rsDataType {
RS_TYPE_FLOAT_32 (2),
RS_TYPE_FLOAT_64 (3),
diff --git a/java/tests/RSTest_CompatLibLegacy/Android.mk b/java/tests/RSTest_CompatLibLegacy/Android.mk
index 2e70798..89c41a9 100644
--- a/java/tests/RSTest_CompatLibLegacy/Android.mk
+++ b/java/tests/RSTest_CompatLibLegacy/Android.mk
@@ -37,7 +37,7 @@
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \
$(TOPDIR)external/clang/lib/Headers \
- $(TOPDIR)frameworks/rs/scriptc
+ $(TOPDIR)frameworks/rs/script_api/include
LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
LOCAL_JNI_SHARED_LIBRARIES := librsjni
diff --git a/java/tests/Refocus/Android.mk b/java/tests/Refocus/Android.mk
index 887f894..d149d21 100644
--- a/java/tests/Refocus/Android.mk
+++ b/java/tests/Refocus/Android.mk
@@ -33,7 +33,7 @@
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \
$(TOPDIR)external/clang/lib/Headers \
- $(TOPDIR)frameworks/rs/scriptc
+ $(TOPDIR)frameworks/rs/script_api/include
LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
LOCAL_JNI_SHARED_LIBRARIES := librsjni
diff --git a/java/tests/RsNbody/Android.mk b/java/tests/RsNbody/Android.mk
index 202d971..6f84735 100644
--- a/java/tests/RsNbody/Android.mk
+++ b/java/tests/RsNbody/Android.mk
@@ -30,6 +30,6 @@
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \
$(TOPDIR)external/clang/lib/Headers \
- $(TOPDIR)frameworks/rs/scriptc
+ $(TOPDIR)frameworks/rs/script_api/include
include $(BUILD_PACKAGE)
diff --git a/rsov/compiler/rs2spirv_driver.sh b/rsov/compiler/rs2spirv_driver.sh
index 93aec13..9406c9b 100755
--- a/rsov/compiler/rs2spirv_driver.sh
+++ b/rsov/compiler/rs2spirv_driver.sh
@@ -65,7 +65,7 @@
mkdir -p $output_folder
eval llvm-rs-cc -o "$output_folder" -S -emit-llvm -Wall -Werror -target-api 24 \
- -I "$AND_HOME/external/clang/lib/Headers" -I "$AND_HOME/frameworks/rs/scriptc" \
+ -I "$AND_HOME/external/clang/lib/Headers" -I "$AND_HOME/frameworks/rs/script_api/include" \
"$script_name" &&
eval llvm-as "$output_folder/bc32/$script.ll" -o "$output_folder/$script.bc" &&
eval rs2spirv "$output_folder/$script.bc" -o "$output_folder/$script.rs.spv" \
diff --git a/api/GenerateDocumentation.cpp b/script_api/GenerateDocumentation.cpp
similarity index 100%
rename from api/GenerateDocumentation.cpp
rename to script_api/GenerateDocumentation.cpp
diff --git a/api/GenerateHeaderFiles.cpp b/script_api/GenerateHeaderFiles.cpp
similarity index 100%
rename from api/GenerateHeaderFiles.cpp
rename to script_api/GenerateHeaderFiles.cpp
diff --git a/api/GenerateStubsWhiteList.cpp b/script_api/GenerateStubsWhiteList.cpp
similarity index 100%
rename from api/GenerateStubsWhiteList.cpp
rename to script_api/GenerateStubsWhiteList.cpp
diff --git a/api/GenerateTestFiles.cpp b/script_api/GenerateTestFiles.cpp
similarity index 100%
rename from api/GenerateTestFiles.cpp
rename to script_api/GenerateTestFiles.cpp
diff --git a/api/Generator.cpp b/script_api/Generator.cpp
similarity index 100%
rename from api/Generator.cpp
rename to script_api/Generator.cpp
diff --git a/api/Generator.h b/script_api/Generator.h
similarity index 100%
rename from api/Generator.h
rename to script_api/Generator.h
diff --git a/api/Scanner.cpp b/script_api/Scanner.cpp
similarity index 100%
rename from api/Scanner.cpp
rename to script_api/Scanner.cpp
diff --git a/api/Scanner.h b/script_api/Scanner.h
similarity index 100%
rename from api/Scanner.h
rename to script_api/Scanner.h
diff --git a/api/Specification.cpp b/script_api/Specification.cpp
similarity index 99%
rename from api/Specification.cpp
rename to script_api/Specification.cpp
index b0ebe91..c103dc1 100644
--- a/api/Specification.cpp
+++ b/script_api/Specification.cpp
@@ -930,7 +930,7 @@
}
bool SystemSpecification::generateFiles(bool forVerification, unsigned int maxApiLevel) const {
- bool success = generateHeaderFiles("scriptc") &&
+ bool success = generateHeaderFiles("include") &&
generateDocumentation("docs", forVerification) &&
generateTestFiles("test", maxApiLevel) &&
generateStubsWhiteList("slangtest", maxApiLevel);
diff --git a/api/Specification.h b/script_api/Specification.h
similarity index 100%
rename from api/Specification.h
rename to script_api/Specification.h
diff --git a/api/Utilities.cpp b/script_api/Utilities.cpp
similarity index 100%
rename from api/Utilities.cpp
rename to script_api/Utilities.cpp
diff --git a/api/Utilities.h b/script_api/Utilities.h
similarity index 100%
rename from api/Utilities.h
rename to script_api/Utilities.h
diff --git a/api/generate.sh b/script_api/generate.sh
similarity index 93%
rename from api/generate.sh
rename to script_api/generate.sh
index fd56676..fbcde0c 100755
--- a/api/generate.sh
+++ b/script_api/generate.sh
@@ -15,13 +15,13 @@
# limitations under the License.
#
-CLANG=$ANDROID_BUILD_TOP/prebuilts/clang/linux-x86/host/3.6/bin/clang++
+CLANG=$ANDROID_BUILD_TOP/prebuilts/clang/host/linux-x86/clang-stable/bin/clang++
set -e
$CLANG Generator.cpp Specification.cpp GenerateDocumentation.cpp GenerateHeaderFiles.cpp GenerateTestFiles.cpp Scanner.cpp Utilities.cpp GenerateStubsWhiteList.cpp -g -std=c++11 -Wall -o generator
mkdir -p test
-mkdir -p scriptc
+mkdir -p include
mkdir -p docs
mkdir -p slangtest
@@ -39,10 +39,6 @@
mv test/* ../../../cts/tests/tests/renderscript/src/android/renderscript/cts/generated/
rmdir test
-rm -f ../scriptc/*.rsh
-mv scriptc/*.rsh ../scriptc
-rmdir scriptc
-
rm -f ../../base/docs/html/guide/topics/renderscript/reference/*.jd
mv docs/*.jd ../../base/docs/html/guide/topics/renderscript/reference/
diff --git a/scriptc/rs_allocation_create.rsh b/script_api/include/rs_allocation_create.rsh
similarity index 100%
rename from scriptc/rs_allocation_create.rsh
rename to script_api/include/rs_allocation_create.rsh
diff --git a/scriptc/rs_allocation_data.rsh b/script_api/include/rs_allocation_data.rsh
similarity index 100%
rename from scriptc/rs_allocation_data.rsh
rename to script_api/include/rs_allocation_data.rsh
diff --git a/scriptc/rs_atomic.rsh b/script_api/include/rs_atomic.rsh
similarity index 100%
rename from scriptc/rs_atomic.rsh
rename to script_api/include/rs_atomic.rsh
diff --git a/scriptc/rs_convert.rsh b/script_api/include/rs_convert.rsh
similarity index 100%
rename from scriptc/rs_convert.rsh
rename to script_api/include/rs_convert.rsh
diff --git a/scriptc/rs_core.rsh b/script_api/include/rs_core.rsh
similarity index 100%
rename from scriptc/rs_core.rsh
rename to script_api/include/rs_core.rsh
diff --git a/scriptc/rs_debug.rsh b/script_api/include/rs_debug.rsh
similarity index 100%
rename from scriptc/rs_debug.rsh
rename to script_api/include/rs_debug.rsh
diff --git a/scriptc/rs_for_each.rsh b/script_api/include/rs_for_each.rsh
similarity index 100%
rename from scriptc/rs_for_each.rsh
rename to script_api/include/rs_for_each.rsh
diff --git a/scriptc/rs_graphics.rsh b/script_api/include/rs_graphics.rsh
similarity index 100%
rename from scriptc/rs_graphics.rsh
rename to script_api/include/rs_graphics.rsh
diff --git a/scriptc/rs_io.rsh b/script_api/include/rs_io.rsh
similarity index 100%
rename from scriptc/rs_io.rsh
rename to script_api/include/rs_io.rsh
diff --git a/scriptc/rs_math.rsh b/script_api/include/rs_math.rsh
similarity index 100%
rename from scriptc/rs_math.rsh
rename to script_api/include/rs_math.rsh
diff --git a/scriptc/rs_matrix.rsh b/script_api/include/rs_matrix.rsh
similarity index 100%
rename from scriptc/rs_matrix.rsh
rename to script_api/include/rs_matrix.rsh
diff --git a/scriptc/rs_object_info.rsh b/script_api/include/rs_object_info.rsh
similarity index 100%
rename from scriptc/rs_object_info.rsh
rename to script_api/include/rs_object_info.rsh
diff --git a/scriptc/rs_object_types.rsh b/script_api/include/rs_object_types.rsh
similarity index 100%
rename from scriptc/rs_object_types.rsh
rename to script_api/include/rs_object_types.rsh
diff --git a/scriptc/rs_quaternion.rsh b/script_api/include/rs_quaternion.rsh
similarity index 100%
rename from scriptc/rs_quaternion.rsh
rename to script_api/include/rs_quaternion.rsh
diff --git a/scriptc/rs_time.rsh b/script_api/include/rs_time.rsh
similarity index 100%
rename from scriptc/rs_time.rsh
rename to script_api/include/rs_time.rsh
diff --git a/scriptc/rs_value_types.rsh b/script_api/include/rs_value_types.rsh
similarity index 100%
rename from scriptc/rs_value_types.rsh
rename to script_api/include/rs_value_types.rsh
diff --git a/scriptc/rs_vector_math.rsh b/script_api/include/rs_vector_math.rsh
similarity index 100%
rename from scriptc/rs_vector_math.rsh
rename to script_api/include/rs_vector_math.rsh
diff --git a/api/rs_allocation_create.spec b/script_api/rs_allocation_create.spec
similarity index 100%
rename from api/rs_allocation_create.spec
rename to script_api/rs_allocation_create.spec
diff --git a/api/rs_allocation_data.spec b/script_api/rs_allocation_data.spec
similarity index 100%
rename from api/rs_allocation_data.spec
rename to script_api/rs_allocation_data.spec
diff --git a/api/rs_atomic.spec b/script_api/rs_atomic.spec
similarity index 100%
rename from api/rs_atomic.spec
rename to script_api/rs_atomic.spec
diff --git a/api/rs_convert.spec b/script_api/rs_convert.spec
similarity index 100%
rename from api/rs_convert.spec
rename to script_api/rs_convert.spec
diff --git a/api/rs_core.spec b/script_api/rs_core.spec
similarity index 100%
rename from api/rs_core.spec
rename to script_api/rs_core.spec
diff --git a/api/rs_debug.spec b/script_api/rs_debug.spec
similarity index 100%
rename from api/rs_debug.spec
rename to script_api/rs_debug.spec
diff --git a/api/rs_for_each.spec b/script_api/rs_for_each.spec
similarity index 100%
rename from api/rs_for_each.spec
rename to script_api/rs_for_each.spec
diff --git a/api/rs_graphics.spec b/script_api/rs_graphics.spec
similarity index 100%
rename from api/rs_graphics.spec
rename to script_api/rs_graphics.spec
diff --git a/api/rs_io.spec b/script_api/rs_io.spec
similarity index 100%
rename from api/rs_io.spec
rename to script_api/rs_io.spec
diff --git a/api/rs_math.spec b/script_api/rs_math.spec
similarity index 100%
rename from api/rs_math.spec
rename to script_api/rs_math.spec
diff --git a/api/rs_matrix.spec b/script_api/rs_matrix.spec
similarity index 100%
rename from api/rs_matrix.spec
rename to script_api/rs_matrix.spec
diff --git a/api/rs_object_info.spec b/script_api/rs_object_info.spec
similarity index 100%
rename from api/rs_object_info.spec
rename to script_api/rs_object_info.spec
diff --git a/api/rs_object_types.spec b/script_api/rs_object_types.spec
similarity index 100%
rename from api/rs_object_types.spec
rename to script_api/rs_object_types.spec
diff --git a/api/rs_quaternion.spec b/script_api/rs_quaternion.spec
similarity index 100%
rename from api/rs_quaternion.spec
rename to script_api/rs_quaternion.spec
diff --git a/api/rs_time.spec b/script_api/rs_time.spec
similarity index 100%
rename from api/rs_time.spec
rename to script_api/rs_time.spec
diff --git a/api/rs_value_types.spec b/script_api/rs_value_types.spec
similarity index 100%
rename from api/rs_value_types.spec
rename to script_api/rs_value_types.spec
diff --git a/api/rs_vector_math.spec b/script_api/rs_vector_math.spec
similarity index 100%
rename from api/rs_vector_math.spec
rename to script_api/rs_vector_math.spec
diff --git a/update_rs_prebuilts.sh b/update_rs_prebuilts.sh
index cc1e562..04f100d 100755
--- a/update_rs_prebuilts.sh
+++ b/update_rs_prebuilts.sh
@@ -215,7 +215,7 @@
# Copy header files for compilers
cp $MY_ANDROID_DIR/external/clang/lib/Headers/*.h renderscript/clang-include
-cp $MY_ANDROID_DIR/frameworks/rs/scriptc/* renderscript/include
+cp $MY_ANDROID_DIR/frameworks/rs/script_api/include/* renderscript/include
# Host-specific tools (bin/ and lib/)
