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

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

Snap for 4693621 from 07a75e0f to pi-release 

Change-Id: I8e050f7507a6553a58714dc85fcfbf9c30f18b81
parents 8cc1cf74 07a75e0f

Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -252,6 +252,11 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ 
		-federate SupportLib https://developer.android.com \

		-federationapi SupportLib prebuilts/sdk/current/support-api.txt



# Federate AndroidX references against local API file.

framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-federate AndroidX https://developer.android.com \

		-federationapi AndroidX prebuilts/sdk/current/androidx-api.txt



# ====  Public API diff ===========================

include $(CLEAR_VARS)

apct-tests/perftests/core/AndroidTest.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

-->

<configuration description="Runs CorePerfTests metric instrumentation.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-metric-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="CorePerfTests.apk" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.perftests.core" />

    </test>

</configuration>

apct-tests/perftests/multiuser/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
LOCAL_PACKAGE_NAME := MultiUserPerfTests

LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_COMPATIBILITY_SUITE += device-tests



LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)

apct-tests/perftests/multiuser/AndroidTest.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

-->

<configuration description="Runs MultiUserPerfTests metric instrumentation.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-metric-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="MultiUserPerfTests.apk" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.perftests.multiuser" />

    </test>

</configuration>

api/current.txt

+66 −43

File changed.

Preview size limit exceeded, changes collapsed.