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

Commit 414d8c1c authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Move art related hidden API flag files to art" am: ef13360a am: 727dfbfe 

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

Change-Id: I93c073a76f1281664315f9ec977fb0e9c9ac85b0
parents 3af62d24 727dfbfe

boot/Android.bp

+9 −3
Original line number Original line Diff line number Diff line
@@ -44,6 +44,15 @@ package { 
platform_bootclasspath {

platform_bootclasspath {

    name: "platform-bootclasspath",

    name: "platform-bootclasspath",





    // The bootclasspath_fragments that contribute to the platform

    // bootclasspath.

    fragments: [

        {

            apex: "com.android.art",

            module: "art-bootclasspath-fragment",

        },

    ],



    // Additional information needed by hidden api processing.

    // Additional information needed by hidden api processing.

    hidden_api: {

    hidden_api: {

        unsupported: [

        unsupported: [
@@ -64,9 +73,6 @@ platform_bootclasspath { 
        max_target_o_low_priority: [

        max_target_o_low_priority: [

            "hiddenapi/hiddenapi-max-target-o.txt",

            "hiddenapi/hiddenapi-max-target-o.txt",

        ],

        ],

        blocked: [

            "hiddenapi/hiddenapi-force-blocked.txt",

        ],

        unsupported_packages: [

        unsupported_packages: [

            "hiddenapi/hiddenapi-unsupported-packages.txt",

            "hiddenapi/hiddenapi-unsupported-packages.txt",

        ],

        ],

boot/hiddenapi/hiddenapi-force-blocked.txt

deleted100644 → 0
+0 −40
Original line number Original line Diff line number Diff line 
Ldalvik/system/VMRuntime;->setHiddenApiExemptions([Ljava/lang/String;)V

Ldalvik/system/VMRuntime;->setTargetSdkVersion(I)V

Ldalvik/system/VMRuntime;->setTargetSdkVersionNative(I)V

Ljava/lang/invoke/MethodHandles$Lookup;->IMPL_LOOKUP:Ljava/lang/invoke/MethodHandles$Lookup;

Ljava/lang/invoke/VarHandle;->acquireFence()V

Ljava/lang/invoke/VarHandle;->compareAndExchange([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndSet([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->fullFence()V

Ljava/lang/invoke/VarHandle;->get([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAdd([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAnd([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOr([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXor([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSet([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getOpaque([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getVolatile([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->loadLoadFence()V

Ljava/lang/invoke/VarHandle;->releaseFence()V

Ljava/lang/invoke/VarHandle;->set([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setOpaque([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setRelease([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setVolatile([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->storeStoreFence()V

Ljava/lang/invoke/VarHandle;->weakCompareAndSet([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetAcquire([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetPlain([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetRelease([Ljava/lang/Object;)Z

boot/hiddenapi/hiddenapi-max-target-o.txt

+0 −11747

File changed.

Preview size limit exceeded, changes collapsed.

boot/hiddenapi/hiddenapi-unsupported-packages.txt

+0 −28
Original line number Original line Diff line number Diff line
@@ -11,33 +11,5 @@ gov.nist.javax.sip.parser 
gov.nist.javax.sip.parser.extensions

gov.nist.javax.sip.parser.extensions

gov.nist.javax.sip.parser.ims

gov.nist.javax.sip.parser.ims

gov.nist.javax.sip.stack

gov.nist.javax.sip.stack

org.apache.xalan

org.apache.xalan.extensions

org.apache.xalan.processor

org.apache.xalan.res

org.apache.xalan.serialize

org.apache.xalan.templates

org.apache.xalan.transformer

org.apache.xalan.xslt

org.apache.xml.dtm

org.apache.xml.dtm.ref

org.apache.xml.dtm.ref.dom2dtm

org.apache.xml.dtm.ref.sax2dtm

org.apache.xml.res

org.apache.xml.serializer

org.apache.xml.serializer.dom3

org.apache.xml.serializer.utils

org.apache.xml.utils

org.apache.xml.utils.res

org.apache.xpath

org.apache.xpath.axes

org.apache.xpath.compiler

org.apache.xpath.domapi

org.apache.xpath.functions

org.apache.xpath.jaxp

org.apache.xpath.objects

org.apache.xpath.operations

org.apache.xpath.patterns

org.apache.xpath.res

org.ccil.cowan.tagsoup

org.ccil.cowan.tagsoup

org.ccil.cowan.tagsoup.jaxp
 
org.ccil.cowan.tagsoup.jaxp