diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-07 15:13:59 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-03-08 10:42:57 +0000 |
| commit | d3bfa334632023b5401df247e60cb43844cdaa72 (patch) | |
| tree | 0d33cddb54fb1c1b21e9f5e0790116ef5e82cb31 /tck-android | |
| parent | 813230ab1acb8cb89189186a61295adf791ac160 (diff) | |
| download | objenesis-d3bfa334632023b5401df247e60cb43844cdaa72.tar.gz | |
Restructure files to match upstream objenesis
Makes the file structure match upstream objenesis so that it is
simpler to update in future. Moving the files as a separate
step to upgrading makes it easier for git to track renames and
simplifies future diffs and reviews.
Bug: 32912773
Test: make checkbuild
Change-Id: Iab45c5439b713dc600131c2cba243ca026c190a4
Diffstat (limited to 'tck-android')
| -rw-r--r-- | tck-android/Android.mk | 6 | ||||
| -rw-r--r-- | tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java (renamed from tck-android/src/org/objenesis/tck/android/TckInstrumentation.java) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tck-android/Android.mk b/tck-android/Android.mk index 7697f47..41752f1 100644 --- a/tck-android/Android.mk +++ b/tck-android/Android.mk @@ -19,8 +19,8 @@ LOCAL_PATH := $(call my-dir) # ------------------------------- # Builds the deployable Objenesis TCK for Android # To build and run: -# make APP-ObjenesisTck -# adb install -r out/target/product/generic/data/app/ObjenesisTck.apk +# make ObjenesisTck +# adb install -r ${ANDROID_PRODUCT_OUT}/data/app/ObjenesisTck/ObjenesisTck.apk # adb shell am instrument -w org.objenesis.tck.android/.TckInstrumentation include $(CLEAR_VARS) @@ -29,5 +29,5 @@ LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck-target -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) include $(BUILD_PACKAGE) diff --git a/tck-android/src/org/objenesis/tck/android/TckInstrumentation.java b/tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java index 23ee5cf..23ee5cf 100644 --- a/tck-android/src/org/objenesis/tck/android/TckInstrumentation.java +++ b/tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java |