diff options
| author | Stephen Hines <srhines@google.com> | 2014-05-13 18:57:38 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-05-13 18:57:57 -0700 |
| commit | c17fa065b6fee1d2176bd057de98b93d723b59e5 (patch) | |
| tree | 1ec86a39d77888f5b8092cb4d7e3918192005c54 /driver | |
| parent | 53a408b7cfb5992eeb159ec305f16dd112ad3080 (diff) | |
| download | rs-c17fa065b6fee1d2176bd057de98b93d723b59e5.tar.gz | |
Switch to use slang/rs_version.mk for consistency.
Change-Id: Ibfda53448570be58941133cb53c1bbb90391aa30
Diffstat (limited to 'driver')
| -rwxr-xr-x | driver/runtime/Android.mk | 10 | ||||
| -rw-r--r-- | driver/runtime/build_bc_lib_internal.mk | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/driver/runtime/Android.mk b/driver/runtime/Android.mk index 64753587..c16b1f2b 100755 --- a/driver/runtime/Android.mk +++ b/driver/runtime/Android.mk @@ -48,14 +48,8 @@ clcore_x86_files := \ arch/x86_sse2.ll \ arch/x86_sse3.ll -ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" - RS_VERSION := $(PLATFORM_SDK_VERSION) -else - # Increment by 1 whenever this is not a final release build, since we want to - # be able to see the RS version number change during development. - # See build/core/version_defaults.mk for more information about this. - RS_VERSION := "(1 + $(PLATFORM_SDK_VERSION))" -endif +# Grab the current value for $(RS_VERSION_DEFINE) +include frameworks/compile/slang/rs_version.mk # Build the base version of the library include $(CLEAR_VARS) diff --git a/driver/runtime/build_bc_lib_internal.mk b/driver/runtime/build_bc_lib_internal.mk index b27e1637..478ab300 100644 --- a/driver/runtime/build_bc_lib_internal.mk +++ b/driver/runtime/build_bc_lib_internal.mk @@ -36,7 +36,7 @@ endif bc_translated_clang_cc1_cflags := $(addprefix -Xclang , $(bc_clang_cc1_cflags)) bc_cflags := -MD \ - -DRS_VERSION=$(RS_VERSION) \ + $(RS_VERSION_DEFINE) \ -std=c99 \ -c \ -O3 \ |