commit 0a2ba570c0b4ccbc8725fb8ca01493fcb0468023
author Tim Zimmermann <tim@linux4.de> Wed Jul 03 04:37:11 2024 +0200
committer Tim Zimmermann <tim@linux4.de> Wed Jul 03 04:37:11 2024 +0200
tree c963212c88f10f94fd3a08babd4b0fb1e3f5c7d3
parent e4bdc4eed03fdfc6c00acc1193c92e06769e42f3
parent eea82abc00f64127c80962f57adb9dbbb05733d4

Merge tag 'android-14.0.0_r54' into leaf-3.2

Android 14.0.0 release 54

* tag 'android-14.0.0_r54':
  Version bump to AP2A.240705.005.A1 [core/build_id.mk]
  Version bump to AP2A.240705.005 [core/build_id.mk]
  Version bump to AP2A.240605.024.A1 [core/build_id.mk]
  Version bump to AP2A.240705.004 [core/build_id.mk]
  Version bump to AP2A.240705.001.A1 [core/build_id.mk]
  ota_from_target_files: read correct api level
  Version bump to AP2A.240705.002 [core/build_id.mk]
  Version bump to AP2A.240705.001 [core/build_id.mk]

Change-Id: Ifc7849eb9adb712862654d92841e0eadce435b3a

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index b8ea1a1..f9578c6 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=AP2A.240605.024
+BUILD_ID=AP2A.240705.005.A1

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index b014021..3996f13 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -490,7 +490,6 @@
       return -1
 
     props = [
-        "ro.board.api_level",
         "ro.board.first_api_level",
         "ro.product.first_api_level",
     ]