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

Unified Diff: build/android/tests/multiple_proguards/src/dummy/DummyActivity.java

Issue 12913017: Support multiple proguard flags from java_apk.gypi. Proguard supports multiple proguard configurati… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 9 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 | « build/android/tests/multiple_proguards/proguard2.flags ('k') | build/java_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/tests/multiple_proguards/src/dummy/DummyActivity.java
diff --git a/ui/base/touch/touch_device_android.cc b/build/android/tests/multiple_proguards/src/dummy/DummyActivity.java
similarity index 52%
copy from ui/base/touch/touch_device_android.cc
copy to build/android/tests/multiple_proguards/src/dummy/DummyActivity.java
index 39e34c24765363d439e175cad62cdc98ef257ed8..291a8100f394307d471d69237eee321c2a5fcc7f 100644
--- a/ui/base/touch/touch_device_android.cc
+++ b/build/android/tests/multiple_proguards/src/dummy/DummyActivity.java
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/touch/touch_device.h"
+package dummy;
-namespace ui {
+import android.app.Activity;
+import android.os.Bundle;
-bool IsTouchDevicePresent() {
- return true;
+/**
+ * Dummy activity to build apk.
+ */
+public class DummyActivity extends Activity {
}
-
-} // namespace ui
« no previous file with comments | « build/android/tests/multiple_proguards/proguard2.flags ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698