Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1912)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: platform_tools/android/tests/expectations/tool/Android.mk

Issue 1696483002: Update Android framework makefile to build static and shared libs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebaseline Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« platform_tools/android/tests/expectations/Android.mk ('K') | « platform_tools/android/tests/expectations/Android.mk ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/tests/expectations/tool/Android.mk
diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk
index b5ecbe4195345f0fc2c87ae780ff0237bd22ddf9..139af3675bb753147e7e27297ff949c25d534160 100644
--- a/platform_tools/android/tests/expectations/tool/Android.mk
+++ b/platform_tools/android/tests/expectations/tool/Android.mk
@@ -9,6 +9,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+
LOCAL_CFLAGS += \
local_cflags
@@ -45,4 +46,5 @@ LOCAL_MODULE := \
# subdirectory in the DATA folder that points to the top level skia resources...
# i.e. external/skia/DATA/skia_resources --> ../resources
LOCAL_PICKUP_FILES := $(LOCAL_PATH)/../DATA
+include $(LOCAL_PATH)/../skia_static_deps.mk
include $(BUILD_NATIVE_TEST)
« platform_tools/android/tests/expectations/Android.mk ('K') | « platform_tools/android/tests/expectations/Android.mk ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698