commit d612627169ef03bea330c5b5be888fe3f3903810
author Jeff Vander Stoep <jeffv@google.com> Mon Jul 15 19:08:37 2019 -0700
committer Jeffrey Vander Stoep <jeffv@google.com> Wed Jul 17 18:57:32 2019 +0000
tree 8f38bd723ff0d69955c6772c1469360c05e67e3c
parent 84338df00141f266a20be6abce20379cd4eabeff

Renderscript: rename .rs extension to .rscript

Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
    Test: atest CtsRenderscriptTestCases
    Test: CtsRsCppTestCases

Change-Id: I0458009b8bb64a012fece364835d5b78d52e15e9
Merged-In: I0458009b8bb64a012fece364835d5b78d52e15e9

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index fd6184b..0f9599e 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -485,7 +485,7 @@
 			"-I"+android.PathForModuleGen(ctx, "aidl").String())
 	}
 
-	if compiler.hasSrcExt(".rs") || compiler.hasSrcExt(".fs") {
+	if compiler.hasSrcExt(".rscript") || compiler.hasSrcExt(".fs") {
 		flags = rsFlags(ctx, flags, &compiler.Properties)
 	}