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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Android.mk

Issue 235883015: Generate tests/Android.mk from gyp (Closed) Base URL: https://skia.googlesource.com/skia.git@generate
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | gyp/apptype_console.gypi » ('j') | gyp/tests.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Android.mk
diff --git a/Android.mk b/Android.mk
index 6c967df24b5a9f0c14442b3f6dd66b17bc4747ce..2e9a31e31819a50f975a455e83fd2f69d30c0aaf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -561,6 +561,9 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH)/include/utils \
$(LOCAL_PATH)/src/utils
+LOCAL_MODULE := \
scroggo 2014/04/25 22:10:56 As usual, the Android.mk files are not checked int
+ libskia
+
LOCAL_SRC_FILES_arm += \
src/core/SkUtilsArm.cpp \
src/opts/memset.arm.S \
@@ -641,7 +644,6 @@ LOCAL_SRC_FILES_arm64 += \
src/opts/SkXfermode_opts_arm_neon.cpp
include external/stlport/libstlport.mk
-LOCAL_MODULE:= libskia
include $(BUILD_SHARED_LIBRARY)
#############################################################
@@ -655,7 +657,4 @@ include $(BUILD_SHARED_LIBRARY)
#include $(BASE_PATH)/gm/Android.mk
# unit-tests
-#include $(BASE_PATH)/tests/Android.mk
-
-# pathOps unit-tests
-# TODO include those sources!
scroggo 2014/04/25 22:10:56 These are included in tests now.
+include $(BASE_PATH)/tests/Android.mk
« no previous file with comments | « no previous file | gyp/apptype_console.gypi » ('j') | gyp/tests.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698