StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove uuidgen.py and update lpmake parameters."

Browse Source
This commit is contained in:
David Anderson
2018-10-04 18:20:47 +00:00
committed by Gerrit Code Review
parent 4d36fcba8c b954afec0b
commit d1428e2748
3 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -2940,9 +2940,9 @@ define build-superimage-target-args
--metadata-slots $(if $(1),2,1) \ --metadata-slots $(if $(1),2,1) \
--device-size $(BOARD_SUPER_PARTITION_SIZE) \ --device-size $(BOARD_SUPER_PARTITION_SIZE) \
$(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \ $(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \
--partition $(name)$(1):$$($(UUIDGEN) $(name)$(1)):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0) \ --partition $(name)$(1):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0) \
$(if $(2), --image $(name)$(1)=$(call images-for-partitions,$(name))) \ $(if $(2), --image $(name)$(1)=$(call images-for-partitions,$(name))) \
$(if $(1), --partition $(name)_b:$$($(UUIDGEN) $(name)_b):readonly:0) \ $(if $(1), --partition $(name)_b:readonly:0) \
) )
endef endef

1
core/config.mk
View File

@@ -705,7 +705,6 @@ JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar
DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar
FAT16COPY := build/make/tools/fat16copy.py FAT16COPY := build/make/tools/fat16copy.py
CHECK_LINK_TYPE := build/make/tools/check_link_type.py CHECK_LINK_TYPE := build/make/tools/check_link_type.py
UUIDGEN := build/make/tools/uuidgen.py
LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX) LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX)
PROGUARD := external/proguard/bin/proguard.sh PROGUARD := external/proguard/bin/proguard.sh

29
tools/uuidgen.py
View File

@@ -1,29 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2018 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
import uuid
def uuidgen(name):
return uuid.uuid5(uuid.uuid5(uuid.NAMESPACE_URL, "android.com"), name)
if __name__ == "__main__":
if len(sys.argv) < 2:
print("Usage: uuidgen.py <name>")
sys.exit(1)
name = sys.argv[1]
print(uuidgen(name))