tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - update make targets (#6958)

Browse Source
This commit is contained in:
Tobrun
2016-11-08 18:38:29 +01:00
committed by GitHub
parent bcdbbbcac2
commit 2b81dee8d3
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@@ -494,6 +494,10 @@ android-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile
android-$1: android-lib-$1
cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
.PHONY: run-android-$1
run-android-$1: android-$1
cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:installDebug && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity
apackage: android-lib-$1
endef
@@ -502,22 +506,33 @@ $(foreach abi,$(ANDROID_ABIS),$(eval $(call ANDROID_RULES,$(abi))))
.PHONY: android
android: android-arm-v7
.PHONY: android-test
android-test:
cd platform/android && ./gradlew testDebugUnitTest --continue
.PHONY: run-android
run-android: run-android-arm-v7
.PHONY: run-android-unit-test
run-android-unit-test:
cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:testDebugUnitTest --continue
.PHONY: android-test-apk
android-test-apk:
cd platform/android && ./gradlew assembleDebug --continue && ./gradlew assembleAndroidTest --continue
.PHONY: android-ui-test
android-ui-test:
cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:assembleDebug --continue && ./gradlew :MapboxGLAndroidSDKTestApp:assembleAndroidTest --continue
.PHONY: run-android-ui-test
run-android-ui-test:
cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -i
.PHONY: apackage
apackage:
cd platform/android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
.PHONY: android-generate-test
android-generate-test:
.PHONY: test-code-android
test-code-android:
node platform/android/scripts/generate-test-code.js
.PHONY: android-ndk-stack
android-ndk-stack:
adb logcat | ndk-stack -sym build/android-arm-v7/Debug
#### Miscellaneous targets #####################################################
.PHONY: style-code
@@ -529,6 +544,7 @@ clean:
-rm -rf ./build \
./platform/android/MapboxGLAndroidSDK/build \
./platform/android/MapboxGLAndroidSDKTestApp/build \
./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \
./platform/android/MapboxGLAndroidSDK/src/main/jniLibs \
./platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs \
./platform/android/MapboxGLAndroidSDK/src/main/assets

2
platform/android/.gitignore vendored
View File

@@ -30,5 +30,5 @@ fabric.properties
captures/
# Generated test cases
MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/activity/gen/
MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen/

8
platform/android/bitrise.yml
View File

@@ -71,7 +71,7 @@ workflows:
- content: |-
#!/bin/bash
echo "Running unit tests from testapp/src/test:"
make android-test
make run-android-unit-test
- script:
title: Generate Espresso sanity tests
run_if: '{{enveq "SKIPCI" "false"}}'
@@ -79,7 +79,7 @@ workflows:
- content: |-
#!/bin/bash
echo "Generate these test locally by executing:"
make android-generate-test
make test-code-android
- script:
title: Run Firebase instrumentation tests
run_if: '{{enveq "SKIPCI" "false"}}'
@@ -90,7 +90,7 @@ workflows:
wget -O platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml "$BITRISEIO_TEST_ACCESS_TOKEN_UI_TEST_URL"
echo "Build seperate test apk:"
make android-test-apk
make android-ui-test
echo "Run tests on firebase:"
gcloud auth activate-service-account --key-file secret.json --project android-gl-native
@@ -223,7 +223,7 @@ workflows:
- content: |-
#!/bin/bash
echo "Generate these test locally by executing:"
make android-generate-test
make test-code-android
- script:
title: Run AWS Device Farm instrumentation tests
inputs: