diff options
| author |  asteinb <asteinb@google.com> | 2018-08-08 07:35:36 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-08 07:37:16 -0700 |
| commit | 60ec7001af92408eade19ece35a14490c7582231 (patch) | |
| tree | d93f1cd27dd14b9fe9f7560426fe5f2028f0f01f /src/test/shell | |
| parent | f05c0a48dc298ad3e90f3acb399cc53c2944a801 (diff) | |
Remove non-static ApplicationManifest methods
Remove all state from the ApplicationManifest class. Actual methods in this
class will be migrated to somewhere more appropriate in upcoming changes.
We now usually use the manifest passed around in the ResourceApk object
instead. (The exception is mobile-install, which still wants to use the raw
manifest.) Note that this manifest is the processed manifest output by resource
processing - using it will somewhat decrease parallelisim, but is also more
correct. (We'll get the parallelisim gains back once we now longer use the
legacy manifest merger and don't need to process the manifest in resource
processing.)
RELNOTES: none
PiperOrigin-RevId: 207881830
Diffstat (limited to 'src/test/shell')
| -rwxr-xr-x | src/test/shell/bazel/android/android_instrumentation_test_integration_test.sh | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/test/shell/bazel/android/android_instrumentation_test_integration_test.sh b/src/test/shell/bazel/android/android_instrumentation_test_integration_test.sh index 4f52867698..36f76b17ff 100755 --- a/src/test/shell/bazel/android/android_instrumentation_test_integration_test.sh +++ b/src/test/shell/bazel/android/android_instrumentation_test_integration_test.sh @@ -130,36 +130,6 @@ EOF "do not reference the same target package" } -function test_no_target_package_attribute_build_failure() { - create_new_workspace - setup_android_sdk_support - setup_android_instrumentation_test_env - - cat > javatests/com/bin/AndroidManifest.xml <<EOF -<?xml version="1.0" encoding="utf-8"?> -<manifest package='com.bin' xmlns:android='http://schemas.android.com/apk/res/android'> - <instrumentation /> -</manifest> -EOF - - assert_build_fails //javatests/com/bin:instr \ - "No <instrumentation> tag containing the targetPackage attribute" -} - -function test_target_package_no_package_specified_build_failure() { - create_new_workspace - setup_android_sdk_support - setup_android_instrumentation_test_env - - cat > java/com/bin/AndroidManifest.xml <<EOF -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" /> -EOF - - assert_build_fails //javatests/com/bin:instr \ - "needs to specify the package name" -} - function test_android_instrumentation_binary_class_filtering() { create_new_workspace setup_android_sdk_support |