Commit 1ac9c1c8 authored by José Henrique's avatar José Henrique
Browse files

More changes for eleven

parent e81a7b4b
......@@ -138,4 +138,4 @@ dmypy.json
cython_debug/
# Others
post_build/
\ No newline at end of file
post_build*/
\ No newline at end of file
......@@ -64,3 +64,5 @@ if not os.path.exists(build_env_vars["ccache_dir"]):
os.makedirs(build_env_vars["ccache_dir"])
build_env_vars["runner_name"] = build_env_vars["CI_RUNNER_DESCRIPTION"]
build_env_vars["post_build_dir"] = (
"post_build_" + build_env_vars["device"] + "_" + build_env_vars["version"])
......@@ -26,13 +26,13 @@ def init_post_build_env_vars(build_env_vars):
result["production"] = result["production"] == "true"
result["generate_incremental"] = result["generate_incremental"] == "true"
if not os.getenv("DEBUG") and os.path.exists("post_build"):
shutil.rmtree('post_build')
if not os.getenv("DEBUG") and os.path.exists(result["post_build_dir"]):
shutil.rmtree(result["post_build_dir"])
if not os.path.exists("post_build"):
os.mkdir("post_build")
if not os.path.exists(result["post_build_dir"]):
os.mkdir(result["post_build_dir"])
os.chdir("post_build")
os.chdir(result["post_build_dir"])
unsigned_target_files_path_glob = result["working_dir"] + \
"/out/target/product/*/obj/PACKAGING/" + \
......@@ -80,19 +80,19 @@ def init_post_build_env_vars(build_env_vars):
os.getenv("build_repo_branch"))
result["tools"] = [
{
"url": build_repo_url,
"branch": build_repo_branch,
"path": "build/make"
"url": "git@gitlab.pixelexperience.org:infra/tools/post_build.git",
"branch": result["fallback_branch"],
"path": "./"
},
{
"url": "https://github.com/PixelExperience/art",
"branch": result["fallback_branch"],
"path": "art"
"url": "git@gitlab.pixelexperience.org:infra/tools/signing_keys.git",
"branch": "master",
"path": "signing_keys"
},
{
"url": "https://github.com/PixelExperience/external_avb",
"branch": result["fallback_branch"],
"path": "external/avb"
"url": build_repo_url,
"branch": build_repo_branch,
"path": "build/make"
},
{
"url": "https://github.com/PixelExperience/device_qcom_sepolicy",
......@@ -108,16 +108,6 @@ def init_post_build_env_vars(build_env_vars):
"url": "https://github.com/PixelExperience/device_qcom_sepolicy-legacy-um",
"branch": result["fallback_branch"],
"path": "device/qcom/sepolicy-legacy-um"
},
{
"url": "git@gitlab.pixelexperience.org:infra/tools/signing_keys.git",
"branch": "master",
"path": "signing_keys"
},
{
"url": "git@gitlab.pixelexperience.org:infra/tools/prebuilts_host_linux-x86.git",
"branch": result["fallback_branch"],
"path": "out/host/linux-x86"
}
]
if result["version"] == "eleven":
......
......@@ -18,8 +18,21 @@ def run_command(cmd):
def sign_target_files_apks(unsigned_target_files_path, dest_target_files_path):
modules_to_skip = [
"AndroidPlatformServices.apk",
"PrebuiltGmsCoreRvc_AdsDynamite.apk",
"PrebuiltGmsCoreRvc_DynamiteLoader.apk",
"PrebuiltGmsCoreRvc_DynamiteModulesA.apk",
"PrebuiltGmsCoreRvc_DynamiteModulesC.apk",
"PrebuiltGmsCoreRvc_GoogleCertificates.apk",
"PrebuiltGmsCoreRvc_MapsDynamite.apk",
"PrebuiltGmsCoreRvc_MeasurementDynamite.apk"
]
signing_keys_dir = "signing_keys/default"
cmd = "python2 build/make/tools/releasetools/sign_target_files_apks"
for module in modules_to_skip:
cmd += " -e " + module + "="
cmd += " -p out/host/linux-x86"
cmd += " -o -d " + signing_keys_dir
cmd += " " + unsigned_target_files_path
cmd += " " + dest_target_files_path
......@@ -37,6 +50,7 @@ def ota_from_target_files(target_files_path,
previous_target_files_path=False):
release_key_path = "signing_keys/default/releasekey"
cmd = "python2 build/make/tools/releasetools/ota_from_target_files"
cmd += " -p out/host/linux-x86"
if file_based_incremental:
cmd += " --file"
if sign:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment