01049c8321
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.
Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
(cherry picked from commit f10c46ef85)
118 lines
3.7 KiB
C++
118 lines
3.7 KiB
C++
/*
|
|
* Copyright (C) 2011 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.
|
|
*/
|
|
|
|
#include <dlfcn.h>
|
|
|
|
#include <cutils/log.h>
|
|
|
|
#include "jni.h"
|
|
#include "DdmConnection.h"
|
|
|
|
namespace android {
|
|
|
|
void DdmConnection_start(const char* name) {
|
|
ALOGI("DdmConnection_start");
|
|
DdmConnection::start(name);
|
|
}
|
|
|
|
void DdmConnection::start(const char* name) {
|
|
JavaVM* vm;
|
|
JNIEnv* env;
|
|
|
|
// start a VM
|
|
JavaVMInitArgs args;
|
|
JavaVMOption opt;
|
|
|
|
opt.optionString =
|
|
"-agentlib:jdwp=transport=dt_android_adb,suspend=n,server=y";
|
|
|
|
args.version = JNI_VERSION_1_4;
|
|
args.options = &opt;
|
|
args.nOptions = 1;
|
|
args.ignoreUnrecognized = JNI_FALSE;
|
|
|
|
|
|
// TODO: Should this just link against libnativehelper and use its
|
|
// JNI_CreateJavaVM wrapper that essential does this dlopen/dlsym
|
|
// work based on the current system default runtime?
|
|
void* libart_dso = dlopen("libart.so", RTLD_NOW);
|
|
ALOGE_IF(!libart_dso, "DdmConnection: %s", dlerror());
|
|
|
|
void* libandroid_runtime_dso = dlopen("libandroid_runtime.so", RTLD_NOW);
|
|
ALOGE_IF(!libandroid_runtime_dso, "DdmConnection: %s", dlerror());
|
|
|
|
if (!libart_dso || !libandroid_runtime_dso) {
|
|
goto error;
|
|
}
|
|
|
|
jint (*JNI_CreateJavaVM)(JavaVM** p_vm, JNIEnv** p_env, void* vm_args);
|
|
JNI_CreateJavaVM = reinterpret_cast<decltype(JNI_CreateJavaVM)>(
|
|
dlsym(libart_dso, "JNI_CreateJavaVM"));
|
|
ALOGE_IF(!JNI_CreateJavaVM, "DdmConnection: %s", dlerror());
|
|
|
|
jint (*registerNatives)(JNIEnv* env, jclass clazz);
|
|
registerNatives = reinterpret_cast<decltype(registerNatives)>(
|
|
dlsym(libandroid_runtime_dso,
|
|
"Java_com_android_internal_util_WithFramework_registerNatives"));
|
|
ALOGE_IF(!registerNatives, "DdmConnection: %s", dlerror());
|
|
|
|
if (!JNI_CreateJavaVM || !registerNatives) {
|
|
goto error;
|
|
}
|
|
|
|
if (JNI_CreateJavaVM(&vm, &env, &args) == 0) {
|
|
jclass startClass;
|
|
jmethodID startMeth;
|
|
|
|
// register native code
|
|
if (registerNatives(env, 0) == 0) {
|
|
// set our name by calling DdmHandleAppName.setAppName()
|
|
startClass = env->FindClass("android/ddm/DdmHandleAppName");
|
|
if (startClass) {
|
|
startMeth = env->GetStaticMethodID(startClass,
|
|
"setAppName", "(Ljava/lang/String;I)V");
|
|
if (startMeth) {
|
|
jstring str = env->NewStringUTF(name);
|
|
env->CallStaticVoidMethod(startClass, startMeth, str, getuid());
|
|
env->DeleteLocalRef(str);
|
|
}
|
|
}
|
|
|
|
// initialize DDMS communication by calling
|
|
// DdmRegister.registerHandlers()
|
|
startClass = env->FindClass("android/ddm/DdmRegister");
|
|
if (startClass) {
|
|
startMeth = env->GetStaticMethodID(startClass,
|
|
"registerHandlers", "()V");
|
|
if (startMeth) {
|
|
env->CallStaticVoidMethod(startClass, startMeth);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return;
|
|
|
|
error:
|
|
if (libandroid_runtime_dso) {
|
|
dlclose(libandroid_runtime_dso);
|
|
}
|
|
if (libart_dso) {
|
|
dlclose(libart_dso);
|
|
}
|
|
}
|
|
|
|
}; // namespace android
|