Commit 20c1212b authored by José Henrique's avatar José Henrique
Browse files

Changes for Android 11

parent 6ada6691
{
"python.pythonPath": "/usr/bin/python3",
"python.linting.pylintEnabled": false,
"python.linting.enabled": true,
"python.linting.pycodestyleEnabled": true,
......
......@@ -41,6 +41,11 @@ elif build_env_vars["version"] == "ten_plus":
build_env_vars["manifest_url"] = manifest_url_main
build_env_vars["manifest_branch"] = "ten-plus"
build_env_vars["fallback_branch"] = "ten"
elif build_env_vars["version"] == "eleven":
build_env_vars["manifest_url"] = manifest_url_main
build_env_vars["manifest_branch"] = "eleven"
build_env_vars["fallback_branch"] = "eleven"
build_env_vars["generate_incremental"] = "false"
else:
sys.exit("Invalid version")
......
......@@ -10,6 +10,10 @@ files_to_upload = []
incremental_info = None
def is_incremental_and_target_files_enabled(post_build_env_vars):
return post_build_env_vars["version"] != "eleven"
def sync_tools(post_build_env_vars):
for env_var in post_build_env_vars["tools"]:
if os.getenv("DEBUG") and os.path.exists(env_var["path"]):
......@@ -48,8 +52,9 @@ def create_release_zip(post_build_env_vars):
files_to_upload.append(
post_build_env_vars["build_name"])
if (post_build_env_vars["production"]
or post_build_env_vars["generate_incremental"]):
if is_incremental_and_target_files_enabled(post_build_env_vars) and (
post_build_env_vars["production"] or
post_build_env_vars["generate_incremental"]):
print("Compressing artifact using zstd...")
compress_target_files(
target_files_path,
......@@ -87,7 +92,8 @@ def generate_incremental(post_build_env_vars):
if post_build_env_vars["production"] else
post_build_env_vars["unsigned_target_files_path"])
if post_build_env_vars["generate_incremental"]:
if (is_incremental_and_target_files_enabled(post_build_env_vars) and
post_build_env_vars["generate_incremental"]):
print("Incremental generation enabled, searching for" +
" latest released build...")
previous_build_name = get_previous_build(
......@@ -154,8 +160,9 @@ def send_to_release_cp(post_build_env_vars):
global incremental_info
print("Uploading build artifacts to releasecp...")
has_target_files = (post_build_env_vars["production"] or
post_build_env_vars["generate_incremental"])
has_target_files = is_incremental_and_target_files_enabled(post_build_env_vars) and (
post_build_env_vars["production"] or
post_build_env_vars["generate_incremental"])
has_aosp_recovery = post_build_env_vars["aosp_recovery"]
json_str = json.dumps({
......
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