Merged
Conversation
…le files to adb push because it doesnt work like 'cp'
oleavr
requested changes
Feb 3, 2017
test/Makefile
Outdated
| deploy: build/armeabi-v7a/runner build/tests.dex build/frida-java.js | ||
| adb shell "rm -rf $(deploy_data_dir) && mkdir -p $(deploy_data_dir)" | ||
| adb push $^ $(deploy_data_dir) | ||
| $(foreach foo, $(^), adb push $(foo) $(deploy_data_dir)) |
Member
There was a problem hiding this comment.
This is supported by the latest adb so let's be blunt and assume that :)
oleavr
reviewed
Feb 3, 2017
test/Makefile
Outdated
| test_classes := $(patsubst %.java,%.class,$(test_sources)) | ||
|
|
||
| android_jar := $(shell echo $(ANDROID_SDK_ROOT))/platforms/android-23/android.jar | ||
| android_jar := $(ANDROID_SDK_ROOT)/platforms/android-23/android.jar |
Member
There was a problem hiding this comment.
The echo hack was to expand the tilde in the default ANDROID_SDK_ROOT. Perhaps we should do: $(abspath $(ANDROID_SDK_ROOT)) instead?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
if calling
makefrom a makefile, use$(MAKE)which allows-joption to work properlyadb pushdoesn work likecpwhere you cancp src1 src2 src3 dst. you have to push each file individually inbuild/armeabi-v7a/runner build/tests.dex build/frida-java.js