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

Commit 80b1a3fc authored by Abhishek Nigam's avatar Abhishek Nigam Committed by Gerrit Code Review
Browse files

Merge changes from topic "nonabrevert" into main 

* changes:
  Revert "Move more non-AB code to separate files"
  Revert "Fix non-AB ota generation failure"
parents 386a5831 1dfca460

tools/releasetools/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -483,13 +483,8 @@ python_binary_host { 
    defaults: ["releasetools_binary_defaults"],

    srcs: [

        "make_recovery_patch.py",

        "non_ab_ota.py",

        "edify_generator.py",

        "check_target_files_vintf.py",

    ],

    libs: [

        "ota_utils_lib",

        "ota_metadata_proto",

        "releasetools_common",

    ],

}

tools/releasetools/check_target_files_vintf.py

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import sys 
import zipfile



import common

from apex_manifest import ParseApexManifest



logger = logging.getLogger(__name__)