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

Commit 9c2f394c authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Revert "Add genrule for the current sdk proto""

am: 65596f4d

Change-Id: I3dc885b3707bcd1b6e2d68ab43965720766187ec
parents 50c19a7d 65596f4d
Loading
Loading
Loading
Loading
+0 −26
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ apex {
    java_libs: [ "framework-sdkext" ],
    prebuilts: [
      "com.android.sdkext.ldconfig",
      "cur_sdkinfo",
      "derive_sdk.rc",
    ],
    key: "com.android.sdkext.key",
@@ -43,28 +42,3 @@ prebuilt_etc {
    filename: "ld.config.txt",
    installable: false,
}

python_binary_host {
    name: "gen_sdkinfo",
    srcs: [
        "derive_sdk/sdk.proto",
        "gen_sdkinfo.py",
    ],
    proto: {
        canonical_path_from_root: false,
    },
}

gensrcs {
    name: "cur_sdkinfo_src",
    srcs: [""],
    tools: [ "gen_sdkinfo" ],
    cmd: "$(location) -v 0 -o $(out)",
}

prebuilt_etc {
    name: "cur_sdkinfo",
    src: ":cur_sdkinfo_src",
    filename: "sdkinfo.binarypb",
    installable: false,
}

apex/sdkext/gen_sdkinfo.py

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line
import sdk_pb2
import sys

if __name__ == '__main__':
  argv = sys.argv[1:]
  if not len(argv) == 4 or sorted([argv[0], argv[2]]) != ['-o', '-v']:
    print('usage: gen_sdkinfo -v <version> -o <output-file>')
    sys.exit(1)

  for i in range(len(argv)):
    if sys.argv[i] == '-o':
      filename = sys.argv[i+1]
    if sys.argv[i] == '-v':
      version = int(sys.argv[i+1])

  proto = sdk_pb2.SdkVersion()
  proto.version = version
  with open(filename, 'wb') as f:
    f.write(proto.SerializeToString())