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

Unified Diff: platform_tools/android/gyp_gen/makefile_writer.py

Issue 290603002: Generate Android.mk for DM. (Closed) Base URL: https://skia.googlesource.com/skia.git@generate_gm
Patch Set: Remove one more generated file. Created 6 years, 7 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 | « platform_tools/android/bin/gyp_to_android.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/gyp_gen/makefile_writer.py
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index 948407e974d2e4d72fd2203e6dec6c2bfcbd08cc..3384773cb6bfb5a4084f18fd4d7b7c4e68ac4be5 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -124,6 +124,9 @@ include $(BASE_PATH)/gm/Android.mk
# unit-tests
include $(BASE_PATH)/tests/Android.mk
+
+# diamond-master (one test to rule them all)
+include $(BASE_PATH)/dm/Android.mk
"""
)
« no previous file with comments | « platform_tools/android/bin/gyp_to_android.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698