Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b231c619 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix test-tiny-framework/run-test-manually.sh" into main

parents b412a3e4 21d4b3df

tools/hoststubgen/hoststubgen/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ java_library_host { 
    ],

    libs: [

        "junit",

        "ow2-asm",

        "ow2-asm-analysis",

        "ow2-asm-commons",

        "ow2-asm-tree",

        "ow2-asm-util",

    ],

    static_libs: [

        "guava",

tools/hoststubgen/hoststubgen/helper-runtime-src/com/android/hoststubgen/hosthelper/HostStubGenProcessedKeepClass.java

+1 −3
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ package com.android.hoststubgen.hosthelper; 


import static java.lang.annotation.ElementType.TYPE;



import org.objectweb.asm.Type;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;
@@ -29,6 +27,6 @@ import java.lang.annotation.Target; 
@Target({TYPE})

@Retention(RetentionPolicy.RUNTIME)

public @interface HostStubGenProcessedKeepClass {

    String CLASS_INTERNAL_NAME = Type.getInternalName(HostStubGenProcessedKeepClass.class);

    String CLASS_INTERNAL_NAME = HostTestUtils.getInternalName(HostStubGenProcessedKeepClass.class);

    String CLASS_DESCRIPTOR = "L" + CLASS_INTERNAL_NAME + ";";

}

tools/hoststubgen/hoststubgen/helper-runtime-src/com/android/hoststubgen/hosthelper/HostStubGenProcessedStubClass.java

+1 −3
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ package com.android.hoststubgen.hosthelper; 


import static java.lang.annotation.ElementType.TYPE;



import org.objectweb.asm.Type;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;
@@ -29,6 +27,6 @@ import java.lang.annotation.Target; 
@Target({TYPE})

@Retention(RetentionPolicy.RUNTIME)

public @interface HostStubGenProcessedStubClass {

    String CLASS_INTERNAL_NAME = Type.getInternalName(HostStubGenProcessedStubClass.class);

    String CLASS_INTERNAL_NAME = HostTestUtils.getInternalName(HostStubGenProcessedStubClass.class);

    String CLASS_DESCRIPTOR = "L" + CLASS_INTERNAL_NAME + ";";

}

tools/hoststubgen/hoststubgen/helper-runtime-src/com/android/hoststubgen/hosthelper/HostTestUtils.java

+9 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.hoststubgen.hosthelper;



import org.objectweb.asm.Type;



import java.io.PrintStream;

import java.lang.StackWalker.Option;

import java.lang.reflect.Method;
@@ -32,7 +30,15 @@ public class HostTestUtils { 
    private HostTestUtils() {

    }



    public static final String CLASS_INTERNAL_NAME = Type.getInternalName(HostTestUtils.class);

    /**

     * Same as ASM's Type.getInternalName(). Copied here, to avoid having a reference to ASM

     * in this JAR.

     */

    public static String getInternalName(final Class<?> clazz) {

        return clazz.getName().replace('.', '/');

    }



    public static final String CLASS_INTERNAL_NAME = getInternalName(HostTestUtils.class);



    /** If true, we won't print method call log. */

    private static final boolean SKIP_METHOD_LOG = "1".equals(System.getenv(

tools/hoststubgen/hoststubgen/test-tiny-framework/run-test-manually.sh

+1 −7
Original line number Diff line number Diff line
@@ -16,14 +16,8 @@ 


source "${0%/*}"/../../common.sh



#**********************************************************************************************

#This script is broken because it relies on soong intermediate files, which seem to have moved.

#**********************************************************************************************



# This scripts run the "tiny-framework" test, but does most stuff from the command line, using

# the native java and javac commands.

# This is useful to





debug=0

while getopts "d" opt; do
@@ -61,7 +55,7 @@ framework_compile_classpaths=( 


test_compile_classpaths=(

  $SOONG_INT/external/junit/junit/android_common/combined/junit.jar

  $ANDROID_BUILD_TOP/out/target/common/obj/JAVA_LIBRARIES/truth-prebuilt_intermediates/classes.jar

  $ANDROID_HOST_OUT/framework/truth-prebuilt.jar

)



test_runtime_classpaths=(