diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 09:59:59 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 09:59:59 -0700 |
commit | a2f3cb8ca47651cbb39aec94de025194f5a52374 (patch) | |
tree | ec75d3f75ef57c244bb71ada2c212af78c6ca63e | |
parent | 3d092d0a89a18918cd8ac80913ccefd73231ca74 (diff) | |
parent | 468f23ac2fa3db150b6c626417de44f5c0f17fa0 (diff) | |
download | system_core-a2f3cb8ca47651cbb39aec94de025194f5a52374.zip system_core-a2f3cb8ca47651cbb39aec94de025194f5a52374.tar.gz system_core-a2f3cb8ca47651cbb39aec94de025194f5a52374.tar.bz2 |
am 468f23ac: Manual merge
Merge commit '468f23ac2fa3db150b6c626417de44f5c0f17fa0'
* commit '468f23ac2fa3db150b6c626417de44f5c0f17fa0':
Build ash as ash with shell_ash tag; install sh symlink
Copyright message changed
-rw-r--r-- | libpixelflinger/col32cb16blend.S | 31 | ||||
-rw-r--r-- | libpixelflinger/col32cb16blend_neon.S | 32 | ||||
-rw-r--r-- | sh/Android.mk | 19 |
3 files changed, 49 insertions, 33 deletions
diff --git a/libpixelflinger/col32cb16blend.S b/libpixelflinger/col32cb16blend.S index 1450bde..1831255 100644 --- a/libpixelflinger/col32cb16blend.S +++ b/libpixelflinger/col32cb16blend.S @@ -1,20 +1,19 @@ /* libs/pixelflinger/col32cb16blend.S -** -** (C) COPYRIGHT 2009 ARM Limited. -** -** 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. -** -*/ + * + * Copyright (C) 2009 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. + */ .text .align diff --git a/libpixelflinger/col32cb16blend_neon.S b/libpixelflinger/col32cb16blend_neon.S index 17b0d01..cbd54d1 100644 --- a/libpixelflinger/col32cb16blend_neon.S +++ b/libpixelflinger/col32cb16blend_neon.S @@ -1,20 +1,20 @@ /* libs/pixelflinger/col32cb16blend_neon.S -** -** (C) COPYRIGHT 2009 ARM Limited. -** -** 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. -** -*/ + * + * Copyright (C) 2009 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. + */ + .text .align diff --git a/sh/Android.mk b/sh/Android.mk index b5e5c38..dcd13d8 100644 --- a/sh/Android.mk +++ b/sh/Android.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES:= \ bltin/echo.c \ init.c -LOCAL_MODULE:= sh +LOCAL_MODULE:= ash +LOCAL_MODULE_TAGS:= shell_ash LOCAL_CFLAGS += -DSHELL -DWITH_LINENOISE @@ -51,3 +52,19 @@ make_ash_files: sh ./mkinit.sh $(PRIVATE_SRC_FILES) include $(BUILD_EXECUTABLE) + + +# create /system/bin/sh symlink to $(TARGET_SHELL) +# not the optimal place for this, but a fitting one + +OUTSYSTEMBINSH := $(TARGET_OUT)/bin/sh +LOCAL_MODULE := systembinsh +$(OUTSYSTEMBINSH): | $(TARGET_SHELL) +$(OUTSYSTEMBINSH): LOCAL_MODULE := $(LOCAL_MODULE) +$(OUTSYSTEMBINSH): + @echo "Symlink: $@ -> $(TARGET_SHELL)" + @rm -rf $@ + $(hide) ln -sf $(TARGET_SHELL) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(OUTSYSTEMBINSH) +ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(OUTSYSTEMBINSH) |