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

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

Snap for 5053735 from adb29b0a to qt-release 

Change-Id: Ib1832480222da31b6bada94f7b5d0d5e62f460f8
parents c54dc03a adb29b0a

cmds/installd/otapreopt.cpp

+2 −26
Original line number Diff line number Diff line
@@ -361,12 +361,11 @@ private: 
        }



        std::string preopted_boot_art_path = StringPrintf("/system/framework/%s/boot.art", isa);

        if (access(preopted_boot_art_path.c_str(), F_OK) == 0) {

          return PatchoatBootImage(isa_path, isa);

        } else {

        if (access(preopted_boot_art_path.c_str(), F_OK) != 0) {

          // No preopted boot image. Try to compile.

          return Dex2oatBootImage(boot_classpath_, art_path, oat_path, isa);

        }

        return true;

    }



    static bool CreatePath(const std::string& path) {
@@ -431,29 +430,6 @@ private: 
        CHECK_EQ(0, closedir(c_dir)) << "Unable to close directory.";

    }



    bool PatchoatBootImage(const std::string& output_dir, const char* isa) const {

        // This needs to be kept in sync with ART, see art/runtime/gc/space/image_space.cc.



        std::vector<std::string> cmd;

        cmd.push_back("/system/bin/patchoat");



        cmd.push_back("--input-image-location=/system/framework/boot.art");

        cmd.push_back(StringPrintf("--output-image-directory=%s", output_dir.c_str()));



        cmd.push_back(StringPrintf("--instruction-set=%s", isa));



        int32_t base_offset = ChooseRelocationOffsetDelta(art::GetImageMinBaseAddressDelta(),

                                                          art::GetImageMaxBaseAddressDelta());

        cmd.push_back(StringPrintf("--base-offset-delta=%d", base_offset));



        std::string error_msg;

        bool result = Exec(cmd, &error_msg);

        if (!result) {

            LOG(ERROR) << "Could not generate boot image: " << error_msg;

        }

        return result;

    }



    bool Dex2oatBootImage(const std::string& boot_cp,

                          const std::string& art_path,

                          const std::string& oat_path,

libs/vr/libbufferhub/consumer_buffer.cpp

+0 −5
Original line number Diff line number Diff line
@@ -174,10 +174,5 @@ int ConsumerBuffer::ReleaseAsync(const DvrNativeBufferMetadata* meta, 


int ConsumerBuffer::Discard() { return Release(LocalHandle()); }



int ConsumerBuffer::SetIgnore(bool ignore) {

  return ReturnStatusOrError(

      InvokeRemoteMethod<BufferHubRPC::ConsumerSetIgnore>(ignore));

}



}  // namespace dvr

}  // namespace android

libs/vr/libbufferhub/include/private/dvr/bufferhub_rpc.h

+0 −2
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ struct BufferHubRPC { 
    kOpProducerGain,

    kOpConsumerAcquire,

    kOpConsumerRelease,

    kOpConsumerSetIgnore,

    kOpProducerBufferDetach,

    kOpConsumerBufferDetach,

    kOpDetachedBufferCreate,
@@ -348,7 +347,6 @@ struct BufferHubRPC { 
  PDX_REMOTE_METHOD(ConsumerAcquire, kOpConsumerAcquire, LocalFence(Void));

  PDX_REMOTE_METHOD(ConsumerRelease, kOpConsumerRelease,

                    void(LocalFence release_fence));

  PDX_REMOTE_METHOD(ConsumerSetIgnore, kOpConsumerSetIgnore, void(bool ignore));

  PDX_REMOTE_METHOD(ProducerBufferDetach, kOpProducerBufferDetach,

                    LocalChannelHandle(Void));

libs/vr/libbufferhub/include/private/dvr/consumer_buffer.h

+0 −7
Original line number Diff line number Diff line
@@ -76,13 +76,6 @@ class ConsumerBuffer : public pdx::ClientBase<ConsumerBuffer, BufferHubBase> { 
  // negative unix error code.

  int Discard();



  // When set, this consumer is no longer notified when this buffer is

  // available. The system behaves as if Discard() is immediately called

  // whenever the buffer is posted. If ignore is set to true while a buffer is

  // pending, it will act as if Discard() was also called.

  // This returns zero or a negative unix error code.

  int SetIgnore(bool ignore);



 private:

  friend BASE;

opengl/libs/EGL/eglApi.cpp

+9 −0
Original line number Diff line number Diff line
@@ -562,6 +562,15 @@ static EGLBoolean processAttributes(egl_display_ptr dp, NativeWindowType window, 
                    break;

                }

            }



            // If the driver doesn't understand it, we should map sRGB-encoded P3 to

            // sRGB rather than just dropping the colorspace on the floor.

            // For this format, the driver is expected to apply the sRGB

            // transfer function during framebuffer operations.

            if (!copyAttribute && attr[1] == EGL_GL_COLORSPACE_DISPLAY_P3_EXT) {

                strippedAttribList->push_back(attr[0]);

                strippedAttribList->push_back(EGL_GL_COLORSPACE_SRGB_KHR);

            }

        }

        if (copyAttribute) {

            strippedAttribList->push_back(attr[0]);