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

Commit cac2a072 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4396223 from 7c18f524 to oc-mr1-release 

Change-Id: Ib231af7e9a2a480c425fff85e81e6356b86994e2
parents 1a6c3bdf 7c18f524

config/compiled-classes-phone

+1 −0
Original line number Diff line number Diff line
@@ -3269,6 +3269,7 @@ android.os.OperationCanceledException 
android.os.Parcel

android.os.Parcel$1

android.os.Parcel$2

android.os.Parcel$ReadWriteHelper

android.os.ParcelFileDescriptor

android.os.ParcelFileDescriptor$1

android.os.ParcelFileDescriptor$2

core/jni/AndroidRuntime.cpp

+6 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    char jitprithreadweightOptBuf[sizeof("-Xjitprithreadweight:")-1 + PROPERTY_VALUE_MAX];

    char jittransitionweightOptBuf[sizeof("-Xjittransitionweight:")-1 + PROPERTY_VALUE_MAX];

    char hotstartupsamplesOptsBuf[sizeof("-Xps-hot-startup-method-samples:")-1 + PROPERTY_VALUE_MAX];

    char madviseRandomOptsBuf[sizeof("-XX:MadviseRandomAccess:")-1 + PROPERTY_VALUE_MAX];

    char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];

    char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];

    char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];
@@ -741,6 +742,11 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
                       jittransitionweightOptBuf,

                       "-Xjittransitionweight:");



    /*

     * Madvise related options.

     */

    parseRuntimeOption("dalvik.vm.madvise-random", madviseRandomOptsBuf, "-XX:MadviseRandomAccess:");



    /*

     * Profile related options.

     */

packages/CtsShim/build/Android.mk

+11 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ LOCAL_PACKAGE_NAME := CtsShimPrivUpgrade 


LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml



LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := libshim_jni



include $(BUILD_PACKAGE)

my_shim_priv_upgrade_apk := $(LOCAL_BUILT_MODULE)
@@ -60,6 +63,9 @@ my_shim_priv_upgrade_apk := 


LOCAL_FULL_MANIFEST_FILE := $(gen)



LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := libshim_jni



include $(BUILD_PACKAGE)



###########################################################
@@ -80,6 +86,9 @@ LOCAL_PACKAGE_NAME := CtsShimPrivUpgradeWrongSHA 


LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml



LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := libshim_jni



include $(BUILD_PACKAGE)
@@ -99,3 +108,5 @@ LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml 


include $(BUILD_PACKAGE)



###########################################################

include $(call all-makefiles-under,$(LOCAL_PATH))

packages/CtsShim/build/jni/Android.mk

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#

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

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := libshim_jni



LOCAL_SRC_FILES := Shim.c



LOCAL_SDK_VERSION := 24



include $(BUILD_SHARED_LIBRARY)

packages/CtsShim/build/jni/Shim.c

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

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

 */



#include <jni.h>
 
 No newline at end of file