API tools faq
paste
Advertisement
aperio

Superior OS Android 14 patches/roomservice

aperio
Aug 20th, 2024 (edited)
32
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.65 KB | None | 0 0
raw download clone embed print report
  1. @@@ roomservice
  2. @@@<?xml version="1.0" encoding="UTF-8"?>
  3. @@@<manifest>
  4. @@@ <project clone-depth="1" path="device/google/pantah" remote="SuperiorOS-Devices" name="device_google_pantah" revision="fourteen-aosp" />
  5. @@@ <project clone-depth="1" path="device/google/gs101" remote="SuperiorOS-Devices" name="device_google_gs101" revision="fourteen-aosp" />
  6. @@@ <project clone-depth="1" path="device/google/gs201" remote="SuperiorOS-Devices" name="device_google_gs201" revision="fourteen-aosp" />
  7. @@@ <project clone-depth="1" path="vendor/google/panther" remote="superior-gitlab" name="vendor_google_panther" revision="fourteen-aosp" />
  8. @@@ <project clone-depth="1" path="device/google/pantah-kernel" remote="aosp" name="device/google/pantah-kernel" />
  9. @@@ <project clone-depth="1" path="packages/resources/devicesettings" remote="github" name="LineageOS/android_packages_resources_devicesettings" revision="lineage-21.0" />
  10. @@@</manifest>
  11. --- build/soong/ui/build/path.go.orig 2024-08-17 01:29:50.872886689 +1000
  12. +++ build/soong/ui/build/path.go 2024-08-17 10:46:19.034520309 +1000
  13. @@ -192,10 +192,10 @@
  14. // Validate usage against disallowed or missing PATH tools.
  15. config := paths.GetConfig(log.Basename)
  16. if config.Error {
  17. - ctx.Printf("Disallowed PATH tool %q used: %#v", log.Basename, log.Args)
  18. - for _, line := range procPrints {
  19. - ctx.Println(line)
  20. - }
  21. + // ctx.Printf("Disallowed PATH tool %q used: %#v", log.Basename, log.Args)
  22. + // for _, line := range procPrints {
  23. + // ctx.Println(line)
  24. + // }
  25. } else {
  26. ctx.Verbosef("Unknown PATH tool %q used: %#v", log.Basename, log.Args)
  27. for _, line := range procPrints {
  28. --- build/soong/java/config/config.go.orig 2024-08-17 01:29:50.860886498 +1000
  29. +++ build/soong/java/config/config.go 2024-08-17 10:46:19.034520309 +1000
  30. @@ -79,7 +79,7 @@
  31. func init() {
  32. pctx.Import("github.com/google/blueprint/bootstrap")
  33.  
  34. - exportedVars.ExportStringStaticVariable("JavacHeapSize", "4096M")
  35. + exportedVars.ExportStringStaticVariable("JavacHeapSize", "5120M")
  36. exportedVars.ExportStringStaticVariable("JavacHeapFlags", "-J-Xmx${JavacHeapSize}")
  37.  
  38. // ErrorProne can use significantly more memory than javac alone, give it a higher heap
  39. --- vendor/google/panther/Android.bp.orig 2024-08-18 14:54:46.069502633 +1000
  40. +++ vendor/google/panther/Android.bp 2024-08-18 18:21:33.145445089 +1000
  41. @@ -93,7 +93,7 @@
  42. privileged: true,
  43. product_specific: true,
  44. }
  45. -
  46. +/*
  47. android_app_import {
  48. name: "DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore",
  49. owner: "google",
  50. @@ -106,7 +106,7 @@
  51. privileged: true,
  52. product_specific: true,
  53. }
  54. -
  55. +*/
  56. android_app_import {
  57. name: "DevicePersonalizationPrebuiltPixel2022-v.U.14.playstore",
  58. owner: "google",
  59. @@ -257,7 +257,7 @@
  60. privileged: true,
  61. system_ext_specific: true,
  62. }
  63. -
  64. +/*
  65. android_app_import {
  66. name: "ConnectivityThermalPowerManager",
  67. owner: "google",
  68. @@ -269,7 +269,7 @@
  69. privileged: true,
  70. system_ext_specific: true,
  71. }
  72. -
  73. +*/
  74. android_app_import {
  75. name: "EuiccGoogleOverlay",
  76. owner: "google",
  77. @@ -307,7 +307,7 @@
  78. privileged: true,
  79. system_ext_specific: true,
  80. }
  81. -
  82. +/*
  83. android_app_import {
  84. name: "HbmSVManager",
  85. owner: "google",
  86. @@ -319,7 +319,7 @@
  87. privileged: true,
  88. system_ext_specific: true,
  89. }
  90. -
  91. +*/
  92. android_app_import {
  93. name: "LLKAgent",
  94. owner: "google",
  95. --- vendor/gms/common/Android.bp.orig 2024-08-17 10:10:17.040228674 +1000
  96. +++ vendor/gms/common/Android.bp 2024-08-17 10:14:08.552831996 +1000
  97. @@ -67,7 +67,7 @@
  98. },
  99. privileged: true,
  100. }
  101. -
  102. +/*
  103. android_app_import {
  104. name: "CalculatorGooglePrebuilt",
  105. owner: "gms",
  106. @@ -93,7 +93,7 @@
  107. },
  108. product_specific: true,
  109. }
  110. -
  111. +*/
  112. android_app_import {
  113. name: "Chrome-Stub",
  114. owner: "gms",
  115. @@ -118,7 +118,7 @@
  116. },
  117. product_specific: true,
  118. }
  119. -
  120. +/*
  121. android_app_import {
  122. name: "GoogleContacts",
  123. owner: "gms",
  124. @@ -131,7 +131,7 @@
  125. },
  126. product_specific: true,
  127. }
  128. -
  129. +*/
  130. android_app_import {
  131. name: "GoogleTTS",
  132. owner: "gms",
  133. @@ -144,7 +144,7 @@
  134. },
  135. product_specific: true,
  136. }
  137. -
  138. +/*
  139. android_app_import {
  140. name: "LatinIMEGooglePrebuilt",
  141. owner: "gms",
  142. @@ -157,7 +157,7 @@
  143. },
  144. product_specific: true,
  145. }
  146. -
  147. +*/
  148. android_app_import {
  149. name: "LocationHistoryPrebuilt",
  150. owner: "gms",
  151. @@ -206,7 +206,7 @@
  152. },
  153. product_specific: true,
  154. }
  155. -
  156. +/*
  157. android_app_import {
  158. name: "Photos",
  159. owner: "gms",
  160. @@ -256,7 +256,7 @@
  161. },
  162. product_specific: true,
  163. }
  164. -
  165. +*/
  166. android_app_import {
  167. name: "SoundAmplifierPrebuilt",
  168. owner: "gms",
  169. @@ -537,7 +537,7 @@
  170. privileged: true,
  171. product_specific: true,
  172. }
  173. -
  174. +/*
  175. android_app_import {
  176. name: "PrebuiltBugle",
  177. owner: "gms",
  178. @@ -550,7 +550,7 @@
  179. privileged: true,
  180. product_specific: true,
  181. }
  182. -
  183. +*/
  184. android_app_import {
  185. name: "PrebuiltGmsCoreSc",
  186. owner: "gms",
  187. @@ -720,7 +720,7 @@
  188. privileged: true,
  189. product_specific: true,
  190. }
  191. -
  192. +/*
  193. android_app_import {
  194. name: "SafetyHubPrebuilt",
  195. owner: "gms",
  196. @@ -734,7 +734,7 @@
  197. privileged: true,
  198. product_specific: true,
  199. }
  200. -
  201. +*/
  202. android_app_import {
  203. name: "ScribePrebuilt",
  204. owner: "gms",
  205. --- external/rust/crates/flate2/Android.bp.orig 2024-08-17 01:30:43.821620954 +1000
  206. +++ external/rust/crates/flate2/Android.bp 2024-08-17 01:30:43.817620905 +1000
  207. @@ -39,7 +39,6 @@
  208.  
  209. rust_test {
  210. name: "flate2_test_src_lib",
  211. - host_supported: true,
  212. crate_name: "flate2",
  213. cargo_env_compat: true,
  214. cargo_pkg_version: "1.0.28",
  215. @@ -66,7 +65,6 @@
  216.  
  217. rust_test {
  218. name: "flate2_test_tests_early-flush",
  219. - host_supported: true,
  220. crate_name: "early_flush",
  221. cargo_env_compat: true,
  222. cargo_pkg_version: "1.0.28",
  223. @@ -94,7 +92,6 @@
  224.  
  225. rust_test {
  226. name: "flate2_test_tests_empty-read",
  227. - host_supported: true,
  228. crate_name: "empty_read",
  229. cargo_env_compat: true,
  230. cargo_pkg_version: "1.0.28",
  231. @@ -122,7 +119,6 @@
  232.  
  233. rust_test {
  234. name: "flate2_test_tests_gunzip",
  235. - host_supported: true,
  236. crate_name: "gunzip",
  237. cargo_env_compat: true,
  238. cargo_pkg_version: "1.0.28",
  239. @@ -157,7 +153,6 @@
  240.  
  241. rust_test {
  242. name: "flate2_test_tests_zero-write",
  243. - host_supported: true,
  244. crate_name: "zero_write",
  245. cargo_env_compat: true,
  246. cargo_pkg_version: "1.0.28",
  247. --- vendor/prebuilts/audio.mk.orig 2024-08-17 10:29:10.801005084 +1000
  248. +++ vendor/prebuilts/audio.mk 2024-08-17 10:29:48.376944199 +1000
  249. @@ -45,8 +45,8 @@
  250.  
  251. # Default ringtone/notification/alarm sounds
  252. PRODUCT_PROPERTY_OVERRIDES += \
  253. - ro.config.ringtone=Soulful.ogg \
  254. - ro.config.notification_sound=Pikachu.ogg \
  255. + ro.config.ringtone=Defined.ogg \
  256. + ro.config.notification_sound=CyanMessage.ogg \
  257. ro.config.alarm_alert=Helium.ogg
  258.  
  259. # Inherit AOSP audio package last so vendor audio overrides AOSP audio
  260. --- vendor/google/panther/panther-vendor.mk.orig 2024-08-18 14:54:46.069502633 +1000
  261. +++ vendor/google/panther/panther-vendor.mk 2024-08-18 18:21:33.145445089 +1000
  262. @@ -72,7 +72,7 @@
  263. vendor/google/panther/proprietary/system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.google.edgetpu_app_service-V3-ndk.so \
  264. vendor/google/panther/proprietary/system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.google.edgetpu_vendor_service-V2-ndk.so \
  265. vendor/google/panther/proprietary/system_ext/lib64/libedgetpu_dba.google.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libedgetpu_dba.google.so \
  266. - vendor/google/panther/proprietary/system_ext/lib64/libhbmsvmanager_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libhbmsvmanager_jni.so \
  267. + #vendor/google/panther/proprietary/system_ext/lib64/libhbmsvmanager_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libhbmsvmanager_jni.so \
  268. vendor/google/panther/proprietary/system_ext/lib64/libmediaadaptor.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmediaadaptor.so \
  269. vendor/google/panther/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
  270. vendor/google/panther/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
  271. @@ -108,11 +108,11 @@
  272. WfcActivation \
  273. OemRilHookService \
  274. CarrierSetup \
  275. - ConnectivityThermalPowerManager \
  276. + #ConnectivityThermalPowerManager \
  277. EuiccGoogleOverlay \
  278. EuiccSupportPixel \
  279. EuiccSupportPixelPermissions \
  280. - HbmSVManager \
  281. + #HbmSVManager \
  282. LLKAgent \
  283. MyVerizonServices \
  284. OemRilService \
  285. @@ -136,8 +136,8 @@
  286. libdmengine_libdmengine_symlink32 \
  287. libdmjavaplugin_libdmjavaplugin_symlink32 \
  288. libdmengine_libdmengine_symlink64 \
  289. - libdmjavaplugin_libdmjavaplugin_symlink64 \
  290. - libhbmsvmanager_jni_libhbmsvmanager_jni_symlink64
  291. + libdmjavaplugin_libdmjavaplugin_symlink64
  292. + #libhbmsvmanager_jni_libhbmsvmanager_jni_symlink64
  293. PRODUCT_COPY_FILES += \
  294. vendor/google/panther/proprietary/product/etc/CarrierSettings/1and1_de.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/1and1_de.pb \
  295. vendor/google/panther/proprietary/product/etc/CarrierSettings/2degrees_nz.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/2degrees_nz.pb \
  296. --- vendor/gms/common/common-vendor.mk.orig 2024-08-17 10:15:29.551682847 +1000
  297. +++ vendor/gms/common/common-vendor.mk 2024-08-17 10:17:39.317873467 +1000
  298. @@ -6,7 +6,7 @@
  299. vendor/gms/common
  300.  
  301. PRODUCT_COPY_FILES += \
  302. - vendor/gms/common/proprietary/product/app/Chrome/Chrome.apk.gz:$(TARGET_COPY_OUT_PRODUCT)/app/Chrome/Chrome.apk.gz \
  303. + #vendor/gms/common/proprietary/product/app/Chrome/Chrome.apk.gz:$(TARGET_COPY_OUT_PRODUCT)/app/Chrome/Chrome.apk.gz \
  304. vendor/gms/common/proprietary/product/app/TrichromeLibrary/TrichromeLibrary.apk.gz:$(TARGET_COPY_OUT_PRODUCT)/app/TrichromeLibrary/TrichromeLibrary.apk.gz \
  305. vendor/gms/common/proprietary/product/app/WebViewGoogle/WebViewGoogle.apk.gz:$(TARGET_COPY_OUT_PRODUCT)/app/WebViewGoogle/WebViewGoogle.apk.gz \
  306. vendor/gms/common/proprietary/product/etc/default-permissions/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
  307. @@ -118,21 +118,21 @@
  308. DocumentsUIGoogle \
  309. GooglePackageInstaller \
  310. TagGoogle \
  311. - CalculatorGooglePrebuilt \
  312. - CalendarGooglePrebuilt \
  313. + #CalculatorGooglePrebuilt \
  314. + #CalendarGooglePrebuilt \
  315. Chrome-Stub \
  316. DevicePolicyPrebuilt \
  317. - GoogleContacts \
  318. + #GoogleContacts \
  319. GoogleTTS \
  320. - LatinIMEGooglePrebuilt \
  321. + #LatinIMEGooglePrebuilt \
  322. LocationHistoryPrebuilt \
  323. MarkupGoogle \
  324. ModuleMetadataGoogle \
  325. NgaResources \
  326. - Photos \
  327. - PrebuiltDeskClockGoogle \
  328. - PrebuiltGmail \
  329. - PrebuiltGoogleTelemetryTvp \
  330. + #Photos \
  331. + #PrebuiltDeskClockGoogle \
  332. + #PrebuiltGmail \
  333. + #PrebuiltGoogleTelemetryTvp \
  334. SoundAmplifierPrebuilt \
  335. SoundPickerPrebuilt \
  336. SwitchAccessPrebuilt \
  337. @@ -152,11 +152,11 @@
  338. FilesPrebuilt \
  339. GoogleOneTimeInitializer \
  340. GoogleRestorePrebuilt-v445524 \
  341. - HealthIntelligenceStubPrebuilt \
  342. - HelpRtcPrebuilt \
  343. + #HealthIntelligenceStubPrebuilt \
  344. + #HelpRtcPrebuilt \
  345. PartnerSetupPrebuilt \
  346. Phonesky \
  347. - PrebuiltBugle \
  348. + #PrebuiltBugle \
  349. PrebuiltGmsCoreSc \
  350. PrebuiltGmsCoreSc_AdsDynamite \
  351. PrebuiltGmsCoreSc_CronetDynamite \
  352. @@ -170,7 +170,7 @@
  353. MlkitBarcodeUIPrebuilt \
  354. VisionBarcodePrebuilt \
  355. RecorderPrebuilt \
  356. - SafetyHubPrebuilt \
  357. + #SafetyHubPrebuilt \
  358. ScribePrebuilt \
  359. SearchSelectorPrebuilt \
  360. SetupWizardPrebuilt \
  361. --- vendor/superior/config/aosp_audio.mk.orig 2024-08-17 10:21:42.887230784 +1000
  362. +++ vendor/superior/config/aosp_audio.mk 2024-08-17 10:25:07.520723074 +1000
  363. @@ -92,6 +92,7 @@
  364. $(LOCAL_PATH)/notifications/sirius.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/sirius.ogg \
  365. $(LOCAL_PATH)/notifications/Sirrah.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Sirrah.ogg \
  366. $(LOCAL_PATH)/notifications/TaDa.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/TaDa.ogg \
  367. + $(LOCAL_PATH)/notifications/CyanMessage.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CyanMessage.ogg \
  368. $(LOCAL_PATH)/notifications/tweeters.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/tweeters.ogg
  369.  
  370. PRODUCT_COPY_FILES += \
  371. @@ -162,6 +163,7 @@
  372. $(LOCAL_PATH)/ringtones/Eridani.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Eridani.ogg \
  373. $(LOCAL_PATH)/ringtones/FreeFlight.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/FreeFlight.ogg \
  374. $(LOCAL_PATH)/ringtones/Lyra.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Lyra.ogg \
  375. + $(LOCAL_PATH)/ringtones/Defined.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Defined.ogg \
  376. $(LOCAL_PATH)/ringtones/ogg/Andromeda.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Andromeda.ogg \
  377. $(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Aquila.ogg \
  378. $(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/ArgoNavis.ogg \
  379. @@ -192,4 +194,4 @@
  380. PRODUCT_COPY_FILES += \
  381. $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/ChargingStarted.ogg \
  382. $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Effect_Tick.ogg \
  383. - $(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/WirelessChargingStarted.ogg
  384. \ No newline at end of file
  385. + $(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/WirelessChargingStarted.ogg
  386. --- build/make/core/envsetup.mk.orig 2024-08-17 01:29:50.732884491 +1000
  387. +++ build/make/core/envsetup.mk 2024-08-17 10:46:19.034520309 +1000
  388. @@ -168,7 +168,7 @@
  389. # We can only create static host binaries for Linux, so if static host
  390. # binaries are requested, turn off Windows cross-builds.
  391. ifeq ($(BUILD_HOST_static),)
  392. - HOST_CROSS_OS := windows
  393. + HOST_CROSS_OS :=
  394. HOST_CROSS_ARCH := x86
  395. HOST_CROSS_2ND_ARCH := x86_64
  396. 2ND_HOST_CROSS_IS_64_BIT := true
  397. --- build/make/core/clear_vars.mk.orig 2024-08-17 01:29:50.732884491 +1000
  398. +++ build/make/core/clear_vars.mk 2024-08-17 10:46:19.034520309 +1000
  399. @@ -31,7 +31,7 @@
  400. LOCAL_CHECK_SAME_VNDK_VARIANTS:=
  401. LOCAL_CHECKED_MODULE:=
  402. LOCAL_C_INCLUDES:=
  403. -LOCAL_CLANG:=
  404. +LOCAL_CLANG:=true
  405. LOCAL_CLANG_ASFLAGS:=
  406. LOCAL_CLANG_CFLAGS:=
  407. LOCAL_CLANG_CONLYFLAGS:=
  408.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!