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

Commit 6c36cd5c authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 3b9255e3: am e57d8918: merge from open-source master

parents deb7a12a 3b9255e3

adb/commandline.c

+6 −0
Original line number Diff line number Diff line
@@ -171,6 +171,12 @@ void help() 
        "\n"

        "  - If it is \"system\" or \"data\", only the corresponding partition\n"

        "    is updated.\n"

        "\n"

        "environmental variables:\n"

        "  ADB_TRACE                    - Print debug information. A comma separated list of the following values\n"

        "                                 1 or all, adb, sockets, packets, rwx, usb, sync, sysdeps, transport, jdwp\n"

        "  ANDROID_SERIAL               - The serial number to connect to. -s takes priority over this if given.\n"

        "  ANDROID_LOG_TAGS             - When used with the logcat option, only these debug tags are printed.\n"

        );

}

libpixelflinger/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -40,7 +40,13 @@ PIXELFLINGER_SRC_FILES:= \ 
	buffer.cpp



ifeq ($(TARGET_ARCH),arm)

ifeq ($(TARGET_ARCH_VERSION),armv7-a)

PIXELFLINGER_SRC_FILES += col32cb16blend_neon.S

PIXELFLINGER_SRC_FILES += col32cb16blend.S

else

PIXELFLINGER_SRC_FILES += t32cb16blend.S

PIXELFLINGER_SRC_FILES += col32cb16blend.S

endif

endif



ifeq ($(TARGET_ARCH),arm)

libpixelflinger/codeflinger/ARMAssembler.cpp

+10 −0
Original line number Diff line number Diff line
@@ -424,5 +424,15 @@ void ARMAssembler::SMLAW(int cc, int y, 
    *mPC++ = (cc<<28) | 0x1200080 | (Rd<<16) | (Rn<<12) | (Rs<<8) | (y<<4) | Rm;

}



#if 0

#pragma mark -

#pragma mark Byte/half word extract and extend (ARMv6+ only)...

#endif



void ARMAssembler::UXTB16(int cc, int Rd, int Rm, int rotate)

{

    *mPC++ = (cc<<28) | 0x6CF0070 | (Rd<<12) | ((rotate >> 3) << 10) | Rm;

}



}; // namespace android

libpixelflinger/codeflinger/ARMAssembler.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ public: 
                int RdHi, int RdLo, int Rs, int Rm);

    virtual void SMLAW(int cc, int y,

                int Rd, int Rm, int Rs, int Rn);

    virtual void UXTB16(int cc, int Rd, int Rm, int rotate);



private:

                ARMAssembler(const ARMAssembler& rhs);

libpixelflinger/codeflinger/ARMAssemblerInterface.h

+3 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ public: 
    virtual void SMLAW(int cc, int y,

                int Rd, int Rm, int Rs, int Rn) = 0;



    // byte/half word extract...

    virtual void UXTB16(int cc, int Rd, int Rm, int rotate) = 0;



    // -----------------------------------------------------------------------

    // convenience...

    // -----------------------------------------------------------------------