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

Commit f12dacaf authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20' into v1-t

parents 041b38d7 a159f249

device.mk

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ PRODUCT_PACKAGES += \ 


# VNDK

PRODUCT_PACKAGES += \

    libcomparetf2 \

    libcomparetf2_shim \

    libgui_vendor \



# WiFi

extract-files.sh

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ function blob_fixup() { 
            grep -q "libui_shim.so" "${2}" || "${PATCHELF}" --add-needed "libui_shim.so" "${2}"

            ;;

        vendor/lib64/hw/camera.qcom.so)

            grep -q "libcomparetf2.so" "${2}" || "${PATCHELF}" --add-needed "libcomparetf2.so" "${2}"

            grep -q "libcomparetf2_shim.so" "${2}" || "${PATCHELF}" --add-needed "libcomparetf2_shim.so" "${2}"

            ;;

    esac

}

libshims/Android.bp

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
//

// Copyright (C) 2021 The LineageOS Project

//

// SPDX-License-Identifier: Apache-2.0

//



cc_library {

    name: "libcomparetf2",

    srcs: ["comparetf2.c"],

    compile_multilib: "64",

    vendor: true,

}

libshims/comparetf2.c

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
//===-- lib/comparetf2.c - Quad-precision comparisons -------------*- C -*-===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.

// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception



#include <limits.h>



typedef __uint128_t rep_t;

typedef __int128_t srep_t;

typedef long double fp_t;



#define REP_C (__uint128_t)

#define typeWidth (sizeof(rep_t) * CHAR_BIT)

#define significandBits 112

#define exponentBits (typeWidth - significandBits - 1)



#define implicitBit (REP_C(1) << significandBits)

#define significandMask (implicitBit - 1U)

#define signBit (REP_C(1) << (significandBits + exponentBits))

#define absMask (signBit - 1U)

#define exponentMask (absMask ^ significandMask)

#define infRep exponentMask



static __inline rep_t toRep(fp_t x) {

  const union {

    fp_t f;

    rep_t i;

  } rep = {.f = x};

  return rep.i;

}



enum LE_RESULT { LE_LESS = -1, LE_EQUAL = 0, LE_GREATER = 1, LE_UNORDERED = 1 };



enum LE_RESULT __lttf2(fp_t a, fp_t b) {



  const srep_t aInt = toRep(a);

  const srep_t bInt = toRep(b);

  const rep_t aAbs = aInt & absMask;

  const rep_t bAbs = bInt & absMask;



  // If either a or b is NaN, they are unordered.

  if (aAbs > infRep || bAbs > infRep)

    return LE_UNORDERED;



  // If a and b are both zeros, they are equal.

  if ((aAbs | bAbs) == 0)

    return LE_EQUAL;



  // If at least one of a and b is positive, we get the same result comparing

  // a and b as signed integers as we would with a floating-point compare.

  if ((aInt & bInt) >= 0) {

    if (aInt < bInt)

      return LE_LESS;

    else if (aInt == bInt)

      return LE_EQUAL;

    else

      return LE_GREATER;

  } else {

    // Otherwise, both are negative, so we need to flip the sense of the

    // comparison to get the correct result.  (This assumes a twos- or ones-

    // complement integer representation; if integers are represented in a

    // sign-magnitude representation, then this flip is incorrect).

    if (aInt > bInt)

      return LE_LESS;

    else if (aInt == bInt)

      return LE_EQUAL;

    else

      return LE_GREATER;

  }

}

proprietary-files.txt

+7 −8
Original line number Diff line number Diff line
@@ -624,15 +624,14 @@ vendor/lib64/liblistenjni.so 
vendor/lib64/liblistensoundmodel2.so

vendor/lib64/libmulawdec.so



# Neural networks - from PNX - RKQ1.200906.002

vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti|2f4c5509649e72b1085c9eabd92a2b0b32090c0e

# Neural networks - From crosshatch - SP1A.210812.016.C2

vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti|e943e09de90c7627c160a55f769f9ad64504370a

vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc|4b7f2c5f914f3eef38f19936c0a06efc09b5b28c

vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml|cda945e7d299d9650df4b4002f5911dd6ac385cb

vendor/lib/rfsa/adsp/libhexagon_nn_skel.so|43ad92a5fdd5a2f9abd631924c820ee2dd8702cf

vendor/lib64/libhexagon_nn_stub.so|a3676113882842116279fe902af00e630ec1778c

vendor/lib64/unnhal-acc-adreno.so|7ad6daa9bf39c5a199b2afb1bd60c1ae53ffbb06

vendor/lib64/unnhal-acc-common.so|32fdec585f2d710e37ffe327894aec6a7ea220eb

vendor/lib64/unnhal-acc-hvx.so|3e44efdca5e1c20ca4bf00c6a5f19fc1863c9830

vendor/lib/rfsa/adsp/libhexagon_nn_skel.so|7f4e9f912d0c44555c9152c24887f9a2302c5393

vendor/lib64/libhexagon_nn_stub.so|021b3c130befa0b73e7057a412dec2315def758a

vendor/lib64/unnhal-acc-adreno.so|0cc2494edc2809c133c030a768ff6740cc0ee767

vendor/lib64/unnhal-acc-common.so|307d7833a1732a14cba19c1dfd1e8e3e955a137a

vendor/lib64/unnhal-acc-hvx.so|772034f1a81a9f8d334db808af8bf3f7857d22b4



# NFC firmware

vendor/lib/libpn553_fw.so