diff options
| author | 2017-02-14 21:32:32 +0000 | |
|---|---|---|
| committer | 2017-02-14 21:32:33 +0000 | |
| commit | 0c306646ed160feb480ef4e9f01db55a527f2ead (patch) | |
| tree | 78a1673ce5d950bc92c6de45c71efb2f90f31f6d | |
| parent | a6dfa573fa951747a09a5fb8b5e1f276e569e934 (diff) | |
| parent | c0af234c46099fb7abe5d121ca4c6a204550905b (diff) | |
Merge "Update test 044 for java-8"
| -rwxr-xr-x | test/044-proxy/build | 17 | ||||
| -rw-r--r-- | test/044-proxy/expected.txt | 2 | ||||
| -rwxr-xr-x | test/etc/default-build | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/test/044-proxy/build b/test/044-proxy/build new file mode 100755 index 0000000000..ab956e26e1 --- /dev/null +++ b/test/044-proxy/build @@ -0,0 +1,17 @@ +#!/bin/bash +# +# Copyright 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +./default-build "$@" --experimental java-8 diff --git a/test/044-proxy/expected.txt b/test/044-proxy/expected.txt index 2a5f0b90db..63a46200d9 100644 --- a/test/044-proxy/expected.txt +++ b/test/044-proxy/expected.txt @@ -87,7 +87,7 @@ Got expected exception Proxy methods: [public final boolean $PROXY_CLASS_NAME1$.equals(java.lang.Object), public final java.lang.Object $PROXY_CLASS_NAME1$.foo(), public final java.lang.String $PROXY_CLASS_NAME1$.foo(), public final int $PROXY_CLASS_NAME1$.hashCode(), public final java.lang.String $PROXY_CLASS_NAME1$.toString()] Invocation of public abstract java.lang.String NarrowingTest$I2.foo() Invoking foo using I2 type: hello -Invocation of public abstract java.lang.Object NarrowingTest$I1.foo() +Invocation of public default java.lang.Object NarrowingTest$I2.foo() Invoking foo using I1 type: 1 Invocation of public abstract java.lang.String NarrowingTest$I2.foo() Got expected exception diff --git a/test/etc/default-build b/test/etc/default-build index e9e388646a..5ba685cb09 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -73,6 +73,7 @@ JACK_EXPERIMENTAL_ARGS["agents"]="-D jack.java.source.version=1.8 -D jack.androi JACK_EXPERIMENTAL_ARGS["default-methods"]="-D jack.java.source.version=1.8 -D jack.android.min-api-level=24" JACK_EXPERIMENTAL_ARGS["lambdas"]="-D jack.java.source.version=1.8 -D jack.android.min-api-level=24" JACK_EXPERIMENTAL_ARGS["method-handles"]="-D jack.java.source.version=1.7 -D jack.android.min-api-level=o-b1" +JACK_EXPERIMENTAL_ARGS["java-8"]="-D jack.java.source.version=1.8 -D jack.android.min-api-level=24" declare -A SMALI_EXPERIMENTAL_ARGS SMALI_EXPERIMENTAL_ARGS["default-methods"]="--api-level 24" |