diff options
| author | Alan Viverette <alanv@google.com> | 2016-04-22 18:41:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-22 18:41:00 +0000 |
| commit | ffdde8030b344c38abfc5e91a373d49f20f2894c (patch) | |
| tree | 5f6aadf6cd76cc2259e66c805e3c957d26c53d39 /support | |
| parent | 4e5e5c729390eb7ec1c438e196aa2a34521da7a2 (diff) | |
| parent | 3533e266fcb0650a8c9c06426d21a366584afdf9 (diff) | |
| download | rs-ffdde8030b344c38abfc5e91a373d49f20f2894c.tar.gz | |
Merge "Clean up deprecation tags in support libraries" into nyc-dev
am: f7bdb2b
* commit 'f7bdb2b37497128b8a9108eea43c17ea544c957a':
Clean up deprecation tags in support libraries
Change-Id: I5e62b6c0b0bf55a2e45f81bb533bdca4f085940f
Diffstat (limited to 'support')
| -rw-r--r-- | support/Android.mk | 4 | ||||
| -rw-r--r-- | support/java/src/android/support/v8/renderscript/ScriptGroup.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/support/Android.mk b/support/Android.mk index 17e06c07..84f151a4 100644 --- a/support/Android.mk +++ b/support/Android.mk @@ -26,7 +26,7 @@ LOCAL_CFLAGS += -std=c++11 LOCAL_MODULE := android-support-v8-renderscript LOCAL_SDK_VERSION := 23 LOCAL_SRC_FILES := $(call all-java-files-under, java/src) -LOCAL_JAVA_LIBRARIES := android-support-annotations +LOCAL_SHARED_ANDROID_LIBRARIES := android-support-annotations LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) @@ -36,7 +36,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) support_module := $(LOCAL_MODULE) support_module_api_dir := $(LOCAL_PATH)/api support_module_src_files := $(LOCAL_SRC_FILES) -support_module_java_libraries := $(LOCAL_MODULE) +support_module_java_libraries := $(LOCAL_JAVA_LIBRARIES) support_module_java_packages := android.support.v8.renderscript include $(SUPPORT_API_CHECK) diff --git a/support/java/src/android/support/v8/renderscript/ScriptGroup.java b/support/java/src/android/support/v8/renderscript/ScriptGroup.java index 065712a9..139fde2f 100644 --- a/support/java/src/android/support/v8/renderscript/ScriptGroup.java +++ b/support/java/src/android/support/v8/renderscript/ScriptGroup.java @@ -476,6 +476,7 @@ public final class ScriptGroup extends BaseObj { * connected. * @param a The allocation to connect. */ + @Deprecated public void setInput(Script.KernelID s, Allocation a) { for (int ct=0; ct < mInputs.length; ct++) { if (mInputs[ct].mKID == s) { @@ -500,6 +501,7 @@ public final class ScriptGroup extends BaseObj { * connected. * @param a The allocation to connect. */ + @Deprecated public void setOutput(Script.KernelID s, Allocation a) { for (int ct=0; ct < mOutputs.length; ct++) { if (mOutputs[ct].mKID == s) { @@ -524,6 +526,7 @@ public final class ScriptGroup extends BaseObj { * * @deprecated Use {@link #execute} instead. */ + @Deprecated public void execute() { if (!mUseIncSupp) { mRS.nScriptGroupExecute(getID(mRS)); @@ -611,6 +614,7 @@ public final class ScriptGroup extends BaseObj { * @deprecated Use {@link Builder2} instead. * */ + @Deprecated public static final class Builder { private RenderScript mRS; private ArrayList<Node> mNodes = new ArrayList<Node>(); |