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

Commit 541e2f00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mockingservicestest: add jni dependency" into sc-dev am: 523ff734 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533735

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90b02bfc663f394963a2e362857c37b9a3aba155
parents ecff3904 523ff734

services/core/jni/Android.bp

+8 −1
Original line number Original line Diff line number Diff line
@@ -56,10 +56,10 @@ cc_library_static { 
        "com_android_server_vibrator_VibratorController.cpp",

        "com_android_server_vibrator_VibratorController.cpp",

        "com_android_server_VibratorManagerService.cpp",

        "com_android_server_VibratorManagerService.cpp",

        "com_android_server_PersistentDataBlockService.cpp",

        "com_android_server_PersistentDataBlockService.cpp",

        "com_android_server_am_CachedAppOptimizer.cpp",

        "com_android_server_am_LowMemDetector.cpp",

        "com_android_server_am_LowMemDetector.cpp",

        "com_android_server_pm_PackageManagerShellCommandDataLoader.cpp",

        "com_android_server_pm_PackageManagerShellCommandDataLoader.cpp",

        "onload.cpp",

        "onload.cpp",

        ":lib_cachedAppOptimizer_native",

        ":lib_networkStatsFactory_native",

        ":lib_networkStatsFactory_native",

    ],

    ],
@@ -193,3 +193,10 @@ filegroup { 
        "com_android_server_net_NetworkStatsFactory.cpp",

        "com_android_server_net_NetworkStatsFactory.cpp",

    ],

    ],

}

}



filegroup {

    name: "lib_cachedAppOptimizer_native",

    srcs: [

        "com_android_server_am_CachedAppOptimizer.cpp",

    ],

}

services/tests/mockingservicestests/Android.bp

+8 −1
Original line number Original line Diff line number Diff line
@@ -11,9 +11,16 @@ 
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.

java_defaults {

    name: "FrameworkMockingServicesTests-jni-defaults",

    jni_libs: [

        "libactivitymanagermockingservicestestjni",

    ],

}





android_test {

android_test {

    name: "FrameworksMockingServicesTests",

    name: "FrameworksMockingServicesTests",

    defaults: ["FrameworkMockingServicesTests-jni-defaults"],





    srcs: ["src/**/*.java", "src/**/*.kt"],

    srcs: ["src/**/*.java", "src/**/*.kt"],

services/tests/mockingservicestests/jni/Android.bp

0 → 100644
+33 −0
Original line number Original line Diff line number Diff line 
cc_library_shared {

    name: "libactivitymanagermockingservicestestjni",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

        "-Wthread-safety",

    ],



    srcs: [

        ":lib_cachedAppOptimizer_native",

        "onload.cpp",

    ],



    include_dirs: [

        "frameworks/base/libs",

        "frameworks/native/services",

        "system/memory/libmeminfo/include",

    ],



    shared_libs: [

        "libandroid",

        "libandroid_runtime",

        "libbase",

        "libbinder",

        "liblog",

        "libmeminfo",

        "libnativehelper",

        "libprocessgroup",

        "libutils",

    ],

}

services/tests/mockingservicestests/jni/onload.cpp

0 → 100644
+45 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */



/*

 * this is a mini native libaray for cached app optimizer tests to run properly. It

 * loads all the native methods necessary.

 */

#include <nativehelper/JNIHelp.h>

#include "jni.h"

#include "utils/Log.h"

#include "utils/misc.h"



namespace android {

int register_android_server_am_CachedAppOptimizer(JNIEnv* env);

};



using namespace android;



extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)

{

    JNIEnv* env = NULL;

    jint result = -1;



    if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {

        ALOGE("GetEnv failed!");

        return result;

    }

    ALOG_ASSERT(env, "Could not retrieve the env!");

    register_android_server_am_CachedAppOptimizer(env);

    return JNI_VERSION_1_4;

}

services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ public final class CachedAppOptimizerTest { 




    @Before

    @Before

    public void setUp() {

    public void setUp() {

        System.loadLibrary("activitymanagermockingservicestestjni");

        mHandlerThread = new HandlerThread("");

        mHandlerThread = new HandlerThread("");

        mHandlerThread.start();

        mHandlerThread.start();

        mHandler = new Handler(mHandlerThread.getLooper());

        mHandler = new Handler(mHandlerThread.getLooper());