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

Unified Diff: build/android/tests/bad_resources/dep/java/src/dummy/dep/Dummy.java

Issue 1136653002: Reland: Actually use --extra-r-text-files in process_resources.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handle APKs with no resources and add a --include-all-resources option Created 5 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
Index: build/android/tests/bad_resources/dep/java/src/dummy/dep/Dummy.java
diff --git a/base/test/malloc_wrapper.cc b/build/android/tests/bad_resources/dep/java/src/dummy/dep/Dummy.java
similarity index 60%
copy from base/test/malloc_wrapper.cc
copy to build/android/tests/bad_resources/dep/java/src/dummy/dep/Dummy.java
index eb280a3eeea52f49e534c7c5e3f6f7a40e80a750..ec08a37db9da41c258a5ed6b2a2a1c785c4009c8 100644
--- a/base/test/malloc_wrapper.cc
+++ b/build/android/tests/bad_resources/dep/java/src/dummy/dep/Dummy.java
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "malloc_wrapper.h"
+package dummy.dep;
-#include <stdlib.h>
-
-void* MallocWrapper(size_t size) {
- return malloc(size);
+/**
+ * Dummy class because we can't have an empty source directory.
+ */
+public class Dummy {
}

Powered by Google App Engine
This is Rietveld 408576698